diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
index 35d2a2dbc35..aaaada19b0b 100644
--- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
+++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
@@ -172,8 +172,12 @@ public class SimulateMatch {
         } catch (Exception | StackOverflowError e) {
             e.printStackTrace();
         } finally {
-            g1.setGameOver(GameEndReason.Draw);
-            sw.stop();
+            if (sw.isStarted()) {
+                sw.stop();
+            }
+            if (!g1.isGameOver()) {
+                g1.setGameOver(GameEndReason.Draw);
+            }
         }
 
         List<GameLogEntry> log;