diff --git a/src/app/App.tsx b/src/app/App.tsx
index 4bd09865..0bc132b2 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -3921,6 +3921,9 @@ export function App({ store, initialStatusMessage }: AppProps) {
           time: nextTime
         })
       );
+      if (!editorSimulationPlaying) {
+        setEditorSimulationClockOverride(null);
+      }
       setStatusMessage(successMessage);
     } catch (error) {
       setStatusMessage(getErrorMessage(error));