diff --git a/code/datums/helper_datums/tension.dm b/code/datums/helper_datums/tension.dm
index 5d68e28dfe5..ce5f3104685 100644
--- a/code/datums/helper_datums/tension.dm
+++ b/code/datums/helper_datums/tension.dm
@@ -4,6 +4,7 @@
 #define EXPLO_SCORE -10000 //boum
 
 #define COOLDOWN_TIME 12000 // Twenty minutes
+#define MIN_ROUND_TIME 18000
 
 //estimated stats
 //80 minute round
@@ -66,7 +67,7 @@ var/global/datum/tension/tension_master
 		score += get_num_players()*PLAYER_WEIGHT
 
 		if(config.Tensioner_Active)
-			if(score > 100000)
+			if(score > 100000 && world.time > MIN_ROUND_TIME)
 				round1++
 				if(!supress && !cooldown)
 					if(prob(1) || forcenexttick)
diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm
index 2b762206792..0cbc4767d33 100644
--- a/maps/tgstation.2.0.8.dmm
+++ b/maps/tgstation.2.0.8.dmm
@@ -5621,13 +5621,13 @@
 "cee" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife)
 "cef" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area)
 "ceg" = (/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_plating)
-"ceh" = (/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0.04; toxins = 5000},/area/holodeck/source_burntest)
+"ceh" = (/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0; toxins = 5000},/area/holodeck/source_burntest)
 "cei" = (/turf/simulated/floor{icon_state = "red"; dir = 9},/area/holodeck/source_emptycourt)
 "cej" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/holodeck/source_emptycourt)
 "cek" = (/turf/simulated/floor,/area/holodeck/source_emptycourt)
 "cel" = (/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/wall{tag = "icon-iron3"; icon = 'mineral_walls.dmi'; icon_state = "iron3"},/area)
 "cem" = (/obj/effect/critter/spesscarp/elite,/turf/simulated/floor/engine{name = "Holodeck Projector Floor"},/area/holodeck/source_wildlife)
-"cen" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0.04; toxins = 5000},/area/holodeck/source_burntest)
+"cen" = (/obj/effect/landmark{name = "Atmospheric Test Start"},/turf/simulated/floor/engine{carbon_dioxide = 0; heat_capacity = 10000; name = "Burn-Mix floor"; nitrogen = 0; oxygen = 2500; temperature = 370; thermal_conductivity = 0; toxins = 5000},/area/holodeck/source_burntest)
 "ceo" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/holodeck/source_emptycourt)
 "cep" = (/turf/simulated/floor{icon_state = "redcorner"; dir = 4},/area/holodeck/source_emptycourt)
 "ceq" = (/turf/simulated/floor{icon_state = "red"; dir = 1},/area/holodeck/source_emptycourt)