diff --git a/src/gs-entbase/shared/ambient_generic.qc b/src/gs-entbase/shared/ambient_generic.qc
index a0e43298..21c886f4 100644
--- a/src/gs-entbase/shared/ambient_generic.qc
+++ b/src/gs-entbase/shared/ambient_generic.qc
@@ -240,9 +240,9 @@ ambient_generic::Respawn(void)
 	if (HasSpawnFlags(AS_ARADIUS)) {
 		m_flRadius = ATTN_NONE;
 	} else if (HasSpawnFlags(AS_SRADIUS)) {
-		m_flRadius = ATTN_IDLE;
-	} else if (HasSpawnFlags(AS_MRADIUS)) {
 		m_flRadius = ATTN_STATIC;
+	} else if (HasSpawnFlags(AS_MRADIUS)) {
+		m_flRadius = ATTN_IDLE;
 	} else if (HasSpawnFlags(AS_LRADIUS)) {
 		m_flRadius = ATTN_NORM;
 	} else {
diff --git a/src/server/entry.qc b/src/server/entry.qc
index e98dc538..3e6385a6 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -463,7 +463,7 @@ initents(void)
 	g_ents_initialized = TRUE;
 
 	/* engine hacks for dedicated servers */
-	cvar_set("s_nominaldistance", "2048");
+	cvar_set("s_nominaldistance", "1024");
 
 	/* other engine hacks */
 	cvar_set("sv_nqplayerphysics", "0");