diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index 7d3127a6b40..b04ea2993e2 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -12,6 +12,7 @@
 /datum/proc/key_up(key, client/user) // Called when a key is released
 	return
 /datum/proc/keyLoop(client/user) // Called once every frame
+	set waitfor = 0
 	return
 
 // removes all the existing macros
@@ -46,4 +47,4 @@
 	if(prefs.hotkeys)
 		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=default")
 	else
-		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default")
\ No newline at end of file
+		winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=old_default")