diff --git a/Source/Editor/Editor.cs b/Source/Editor/Editor.cs
index 43f7428cd..092875be1 100644
--- a/Source/Editor/Editor.cs
+++ b/Source/Editor/Editor.cs
@@ -1320,9 +1320,18 @@ namespace FlaxEditor
             AnimGraphDebugFlow?.Invoke(debugFlow);
         }
 
-        internal static void Internal_RequestStartPlay()
+        private static void RequestStartPlayOnStartup()
         {
-            Instance.Simulation.RequestStartPlay();
+            if (Instance.StateMachine.IsEditMode)
+            {
+                Instance.Simulation.RequestStartPlay();
+                Instance.StateMachine.StateChanged -= RequestStartPlayOnStartup;
+            }
+        }
+        
+        internal static void Internal_RequestStartPlayOnStartup()
+        {
+            Instance.StateMachine.StateChanged += RequestStartPlayOnStartup;
         }
         
         [MethodImpl(MethodImplOptions.InternalCall)]
diff --git a/Source/Editor/Managed/ManagedEditor.cpp b/Source/Editor/Managed/ManagedEditor.cpp
index cdae24a1d..6be85e0b9 100644
--- a/Source/Editor/Managed/ManagedEditor.cpp
+++ b/Source/Editor/Managed/ManagedEditor.cpp
@@ -35,7 +35,7 @@ MMethod* Internal_GetGameWindowSize = nullptr;
 MMethod* Internal_OnAppExit = nullptr;
 MMethod* Internal_OnVisualScriptingDebugFlow = nullptr;
 MMethod* Internal_OnAnimGraphDebugFlow = nullptr;
-MMethod* Internal_RequestStartPlay = nullptr;
+MMethod* Internal_RequestStartPlayOnStartup = nullptr;
 
 void OnLightmapsBake(ShadowsOfMordor::BuildProgressStep step, float stepProgress, float totalProgress, bool isProgressEvent)
 {
@@ -232,7 +232,7 @@ void ManagedEditor::Init()
     args[0] = &isHeadless;
     args[1] = &skipCompile;
     Guid sceneId;
-    if (Guid::Parse(CommandLine::Options.Game.GetValue(), sceneId))
+    if (CommandLine::Options.Game.HasValue() && Guid::Parse(CommandLine::Options.Game.GetValue(), sceneId))
     {
         sceneId = Guid::Empty;
     }
@@ -492,12 +492,12 @@ void ManagedEditor::RequestStartPlay()
 {
     if (!HasManagedInstance())
         return;
-    if (Internal_RequestStartPlay == nullptr)
+    if (Internal_RequestStartPlayOnStartup == nullptr)
     {
-        Internal_RequestStartPlay = GetClass()->GetMethod("Internal_RequestStartPlay");
-        ASSERT(Internal_RequestStartPlay);
+        Internal_RequestStartPlayOnStartup = GetClass()->GetMethod("Internal_RequestStartPlayOnStartup");
+        ASSERT(Internal_RequestStartPlayOnStartup);
     }
-    Internal_RequestStartPlay->Invoke(GetManagedInstance(), nullptr, nullptr);
+    Internal_RequestStartPlayOnStartup->Invoke(GetManagedInstance(), nullptr, nullptr);
 }
 
 void ManagedEditor::OnEditorAssemblyLoaded(MAssembly* assembly)