diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 3dec3096c21..2b9aeda497f 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -396,8 +396,8 @@
 
 
 /client/proc/is_connecting_from_localhost()
-	var/localhost_addresses = list("127.0.0.1", "::1") // Adresses
-	if(!isnull(address) && (address in localhost_addresses))
+	var/static/list/localhost_addresses = list("127.0.0.1", "::1")
+	if((!address && !world.port) || (address in localhost_addresses))
 		return TRUE
 	return FALSE