diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 39487efc54..8ae002dd2f 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -268,9 +268,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 	else
 		prefs = new /datum/preferences(src)
 		GLOB.preferences_datums[ckey] = prefs
-	if(SSinput.initialized)
-		set_macros()
-	update_movement_keys(prefs)
+	addtimer(CALLBACK(src, .proc/ensure_keys_set), 0)	//prevents possible race conditions
 
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
@@ -464,6 +462,11 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 
 	Master.UpdateTickRate()
 
+/client/proc/ensure_keys_set()
+	if(SSinput.initialized)
+		set_macros()
+	update_movement_keys(prefs)
+
 //////////////
 //DISCONNECT//
 //////////////