diff --git a/code/modules/gamemaster/event2/events/everyone/gravity.dm b/code/modules/gamemaster/event2/events/everyone/gravity.dm
index 37a0e2daeb..c57f3bd919 100644
--- a/code/modules/gamemaster/event2/events/everyone/gravity.dm
+++ b/code/modules/gamemaster/event2/events/everyone/gravity.dm
@@ -22,12 +22,12 @@
 	Please stand by while the gravity system reinitializes.", "Gravity Failure")
 
 /datum/event2/event/gravity/start()
-	for(var/area/A in all_areas)
+	for(var/area/A in world)
 		if(A.z in get_location_z_levels())
 			A.gravitychange(FALSE)
 
 /datum/event2/event/gravity/end()
-	for(var/area/A in all_areas)
+	for(var/area/A in world)
 		if(A.z in get_location_z_levels())
 			A.gravitychange(TRUE)
 
diff --git a/code/modules/gamemaster/event2/events/security/prison_break.dm b/code/modules/gamemaster/event2/events/security/prison_break.dm
index 7c5127c26c..c178d1f990 100644
--- a/code/modules/gamemaster/event2/events/security/prison_break.dm
+++ b/code/modules/gamemaster/event2/events/security/prison_break.dm
@@ -177,7 +177,7 @@
 
 
 /datum/event2/event/prison_break/set_up()
-	for(var/area/A in all_areas)
+	for(var/area/A in world)
 		if(is_type_in_list(A, area_types_to_break) && !is_type_in_list(A, area_types_to_ignore))
 			areas_to_break += A