diff --git a/core/ConVarManager.cpp b/core/ConVarManager.cpp
index ca8e8cb0..a4c4fc00 100644
--- a/core/ConVarManager.cpp
+++ b/core/ConVarManager.cpp
@@ -123,6 +123,8 @@ void ConVarManager::OnSourceModAllInitialized()
 	}
 #endif
 
+	g_Players.AddClientListener(this);
+
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	SH_ADD_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
 #else
@@ -194,6 +196,8 @@ void ConVarManager::OnSourceModShutdown()
 	}
 #endif
 
+	g_Players.RemoveClientListener(this);
+
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	SH_REMOVE_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
 #else
@@ -310,6 +314,22 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 	}
 }
 
+void ConVarManager::OnClientDisconnected(int client)
+{
+	/* Remove convar queries for this client that haven't returned results yet */
+	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
+	{
+		ConVarQuery &query = (*iter);
+		if (query.client == client)
+		{
+			iter = m_ConVarQueries.erase(iter);
+			continue;
+		}
+
+		++iter;
+	}
+}
+
 void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
 {
 }
@@ -628,7 +648,7 @@ QueryCvarCookie_t ConVarManager::QueryClientConVar(edict_t *pPlayer, const char
 		return InvalidQueryCvarCookie;
 	}
 
-	ConVarQuery query = {cookie, pCallback, (cell_t)hndl};
+	ConVarQuery query = {cookie, pCallback, (cell_t)hndl, IndexOfEdict(pPlayer)};
 	m_ConVarQueries.push_back(query);
 #endif
 
diff --git a/core/ConVarManager.h b/core/ConVarManager.h
index 2e77d2d2..a1f26982 100644
--- a/core/ConVarManager.h
+++ b/core/ConVarManager.h
@@ -39,8 +39,10 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
+#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
+#include "PlayerManager.h"
 
 #if SOURCE_ENGINE == SE_DARKMESSIAH
 class EQueryCvarValueStatus;
@@ -80,6 +82,7 @@ struct ConVarQuery
 	QueryCvarCookie_t cookie;			/**< Cookie that identifies query */
 	IPluginFunction *pCallback;			/**< Function that will be called when query is finished */
 	cell_t value;						/**< Optional value passed to query function */
+	cell_t client;						/**< Only used for cleaning up on client disconnection */
 };
 
 class ConVarManager :
@@ -87,7 +90,8 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker
+	public IConCommandTracker,
+	public IClientListener
 {
 public:
 	ConVarManager();
@@ -106,6 +110,8 @@ public: //IRootConsoleCommand
 	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public: //IConCommandTracker
 	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+public: //IClientListener
+	void OnClientDisconnected(int client);
 public:
 	/**
 	 * Create a convar and return a handle to it.