diff --git a/code/modules/client/preferences/screen.dm b/code/modules/client/preferences/screen.dm
index a04a1f67d17..338972a0a6b 100644
--- a/code/modules/client/preferences/screen.dm
+++ b/code/modules/client/preferences/screen.dm
@@ -13,4 +13,7 @@
 	savefile_identifier = PREFERENCE_PLAYER
 
 /datum/preference/toggle/fullscreen_mode/apply_to_client(client/client, value)
+	//let's not apply unless the client is fully logged in, therefore manually triggering it.
+	if(!client.fully_created)
+		return
 	client.set_fullscreen()