diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4dd702544c0..ca2652eb049 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1399,11 +1399,14 @@ var/global/enabled_spooking = 0
 /datum/admins/proc/set_odyssey()
 	set name = "Set Odyssey Type"
 	set category = "Special Verbs"
+	if (!SSodyssey.initialized)
+		to_chat(usr, SPAN_WARNING("You must wait for the server to finish initializing."))
+		return
 
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(SSticker.current_state != GAME_STATE_SETTING_UP)
+	if(SSticker.current_state > GAME_STATE_SETTING_UP)
 		to_chat(usr, SPAN_WARNING("You need to use this verb while the game is still setting up!"))
 		return
 
diff --git a/html/changelogs/hellfirejag fix-set-ody.yml b/html/changelogs/hellfirejag fix-set-ody.yml
new file mode 100644
index 00000000000..74d8c41ba48
--- /dev/null
+++ b/html/changelogs/hellfirejag fix-set-ody.yml	
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - bugfix: "Fixed the Set Odyssey verb not working. It can now be used anytime after initialization, but before the round actually starts."