diff --git a/src/pocketmine/command/defaults/GamemodeCommand.php b/src/pocketmine/command/defaults/GamemodeCommand.php
index 063993aee4..6070d7866c 100644
--- a/src/pocketmine/command/defaults/GamemodeCommand.php
+++ b/src/pocketmine/command/defaults/GamemodeCommand.php
@@ -60,7 +60,6 @@ class GamemodeCommand extends VanillaCommand{
 			return true;
 		}
 
-		$target = $sender;
 		if(isset($args[1])){
 			$target = $sender->getServer()->getPlayer($args[1]);
 			if($target === null){
@@ -68,7 +67,9 @@ class GamemodeCommand extends VanillaCommand{
 
 				return true;
 			}
-		}elseif(!($sender instanceof Player)){
+		}elseif($sender instanceof Player){
+			$target = $sender;
+		}else{
 			throw new InvalidCommandSyntaxException();
 		}