diff --git a/src/p_setup.c b/src/p_setup.c
index 2e26404e..b9554822 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2265,8 +2265,10 @@ static void P_LevelInitStuff(void)
 
 	leveltime = 0;
 
-	localaiming = 0;
-	localaiming2 = 0;
+	localaiming = localaiming2 = localaiming3 = localaiming4 = 0;
+
+	// map object scale
+	mapobjectscale = mapheaderinfo[gamemap-1]->mobj_scale;
 
 	// special stage tokens, emeralds, and ring total
 	tokenbits = 0;
diff --git a/src/p_spec.c b/src/p_spec.c
index 35d26c6c..b3ed61bc 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5717,8 +5717,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
 	else
 		curWeather = PRECIP_NONE;
 
-	mapobjectscale = mapheaderinfo[gamemap-1]->mobj_scale;
-
 	P_InitTagLists();   // Create xref tables for tags
 	P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line