diff --git a/src/Server.php b/src/Server.php
index 59a09aa40..9c8d685a8 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -1113,7 +1113,7 @@ class Server{
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - $this->startTime, 3)]));
 
 			//TODO: move console parts to a separate component
-			$consoleSender = new ConsoleCommandSender();
+			$consoleSender = new ConsoleCommandSender($this);
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $consoleSender);
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $consoleSender);
 
diff --git a/src/command/ConsoleCommandSender.php b/src/command/ConsoleCommandSender.php
index 7eb708626..f4dbf2264 100644
--- a/src/command/ConsoleCommandSender.php
+++ b/src/command/ConsoleCommandSender.php
@@ -34,15 +34,18 @@ use const PHP_INT_MAX;
 class ConsoleCommandSender implements CommandSender{
 	use PermissibleDelegateTrait;
 
+	/** @var Server */
+	private $server;
 	/** @var int|null */
 	protected $lineHeight = null;
 
-	public function __construct(){
+	public function __construct(Server $server){
+		$this->server = $server;
 		$this->perm = new PermissibleBase($this);
 	}
 
 	public function getServer() : Server{
-		return Server::getInstance();
+		return $this->server;
 	}
 
 	/**