diff --git a/scripts/server/developer.js b/scripts/server/developer.js
index 86797ea9..7d4e6aa6 100644
--- a/scripts/server/developer.js
+++ b/scripts/server/developer.js
@@ -329,7 +329,7 @@ function clientRunCodeFail(client, returnTo, code) {
 // ---------------------------------------------------------------------------
 
 function clientRunCodeSuccess(client, returnTo, returnVal, code) {
-	let returnClient = getClients()[returnTo];
+	let returnClient = getClientFromIndex(returnTo);
 	if(!returnClient) {
 		return false;
 	}