diff --git a/src/main/java/org/ultramine/commands/basic/BasicCommands.java b/src/main/java/org/ultramine/commands/basic/BasicCommands.java
index 5be44d0..bbd2e62 100644
--- a/src/main/java/org/ultramine/commands/basic/BasicCommands.java
+++ b/src/main/java/org/ultramine/commands/basic/BasicCommands.java
@@ -89,11 +89,11 @@
 	@Command(
 			name = "homelist",
 			group = "player",
-			permissions = {"command.basic.home.multi"}
+			permissions = {"command.basic.home.multi"},
+			isUsableFromServer = false
 	)
 	public static void homelist(CommandContext ctx)
 	{
-		ctx.getSenderAsPlayer();
 		ctx.sendMessage("command.homelist.head");
 		for(Map.Entry<String, WarpLocation> ent : ctx.getSenderAsPlayer().getData().core().getHomes().entrySet())
 			ctx.sendMessage(GOLD, "    - %s [%s](%s, %s, %s)", ent.getKey(), ent.getValue().dimension, (int)ent.getValue().x, (int)ent.getValue().y, (int)ent.getValue().z);
@@ -174,7 +174,6 @@
 	)
 	public static void warplist(CommandContext ctx)
 	{
-		ctx.getSenderAsPlayer();
 		ctx.sendMessage("command.warplist.head");
 		for(Map.Entry<String, WarpLocation> ent : ctx.getServerData().getWarps().entrySet())
 			ctx.sendMessage(GOLD, "    - %s [%s](%s, %s, %s)", ent.getKey(), ent.getValue().dimension, (int)ent.getValue().x, (int)ent.getValue().y, (int)ent.getValue().z);