diff --git a/chat_commands/chat_command_god_mode.gsc b/chat_commands/chat_command_god_mode.gsc
index b63cea2..b07bb19 100644
--- a/chat_commands/chat_command_god_mode.gsc
+++ b/chat_commands/chat_command_god_mode.gsc
@@ -60,7 +60,7 @@ ThreadGodMode()
     
     for(;;)
     {
-        self waittill("spawned_player");
+        self waittill_any("spawned_player", "gr_eject_sequence_complete"); // Origins robot ejected
 
         self DoGodMode(true);
     }