diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php
index 1bc42178e..36d6bef55 100644
--- a/src/pocketmine/network/query/QueryHandler.php
+++ b/src/pocketmine/network/query/QueryHandler.php
@@ -47,11 +47,15 @@ class QueryHandler implements RawPacketHandler{
 	/** @var string */
 	private $token;
 
+	/** @var \Logger */
+	private $logger;
+
 	public const HANDSHAKE = 9;
 	public const STATISTICS = 0;
 
 	public function __construct(){
 		$this->server = Server::getInstance();
+		$this->logger = new \PrefixedLogger($this->server->getLogger(), "Query Handler");
 		$addr = $this->server->getIp();
 		$port = $this->server->getPort();
 
@@ -66,18 +70,13 @@ class QueryHandler implements RawPacketHandler{
 
 		$this->regenerateToken();
 		$this->lastToken = $this->token;
-		$this->server->getLogger()->info($this->server->getLanguage()->translateString("pocketmine.server.query.running", [$addr, $port]));
+		$this->logger->info($this->server->getLanguage()->translateString("pocketmine.server.query.running", [$addr, $port]));
 	}
 
 	public function getPattern() : string{
 		return '/^\xfe\xfd.+$/s';
 	}
 
-	private function debug(string $message) : void{
-		//TODO: replace this with a proper prefixed logger
-		$this->server->getLogger()->debug("[Query] $message");
-	}
-
 	public function regenerateToken() : void{
 		$this->lastToken = $this->token;
 		$this->token = random_bytes(16);
@@ -117,7 +116,7 @@ class QueryHandler implements RawPacketHandler{
 				case self::STATISTICS: //Stat
 					$token = $stream->getInt();
 					if($token !== ($t1 = self::getTokenString($this->token, $address)) and $token !== ($t2 = self::getTokenString($this->lastToken, $address))){
-						$this->debug("Bad token $token from $address $port, expected $t1 or $t2");
+						$this->logger->debug("Bad token $token from $address $port, expected $t1 or $t2");
 
 						return true;
 					}
@@ -137,7 +136,7 @@ class QueryHandler implements RawPacketHandler{
 					return false;
 			}
 		}catch(BinaryDataException $e){
-			$this->debug("Bad packet from $address $port: " . $e->getMessage());
+			$this->logger->debug("Bad packet from $address $port: " . $e->getMessage());
 			return false;
 		}
 	}