diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm
index 4f59db675f..ef20f72028 100644
--- a/code/controllers/subsystem/nightshift.dm
+++ b/code/controllers/subsystem/nightshift.dm
@@ -8,11 +8,11 @@ SUBSYSTEM_DEF(nightshift)
 	var/current_tod = null
 
 	var/nightshift_active = FALSE
-	var/nightshift_start_time = 576000	//4pm	//702000=7:30 PM, station time
-	var/nightshift_end_time = 360000	//10am	//270000=7:30 AM, station time
-	var/nightshift_dawn_start = 288000		//198000=530am
-	var/nightshift_day_start = 360000		//270000=730am
-	var/nightshift_dusk_start = 504000		//630000=530pm
+	var/nightshift_start_time = 720000	//4pm	//702000=7:30 PM, station time
+	var/nightshift_end_time = 144000	//10am	//270000=7:30 AM, station time
+	var/nightshift_dawn_start = 144000		//198000=530am
+	var/nightshift_day_start = 288000		//270000=730am
+	var/nightshift_dusk_start = 576000		//630000=530pm
 
 	//1hr = 36000
 	//30m = 18000
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 7ec865ec2b..b43fa2ac60 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(ticker)
 	//376000 day
 	var/gametime_offset = 288001		//Deciseconds to add to world.time for station time.
 	var/station_time_rate_multiplier = 50		//factor of station time progressal vs real time.
-	var/time_until_vote = 999999 MINUTES
+	var/time_until_vote = 999999999 MINUTES
 	var/last_vote_time = null
 	var/autovote = TRUE
 	var/firstvote = TRUE