diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java
index 08bd0c528ab..96eef68794a 100644
--- a/src/main/java/forge/AllZone.java
+++ b/src/main/java/forge/AllZone.java
@@ -435,14 +435,11 @@ public final class AllZone implements NewConstants {
      * <p>Resets everything possible to set a new game.</p>
      */
     public static void newGameCleanup() {
-
         Singletons.getModel().getGameState().newGameCleanup();
-       
         
         getDisplay().showCombat("");
         getDisplay().loadPrefs();
 
-
         getInputControl().clearInput();
 
         getColorChanger().reset();
@@ -450,9 +447,6 @@ public final class AllZone implements NewConstants {
         // player.reset() now handles this
         //AllZone.getHumanPlayer().clearHandSizeOperations();
         //AllZone.getComputerPlayer().clearHandSizeOperations();
-
-        getTriggerHandler().clearRegistered();
-
     }
 
     /**
diff --git a/src/main/java/forge/model/FGameState.java b/src/main/java/forge/model/FGameState.java
index 4e20e46c4ff..ff17acb5c9c 100644
--- a/src/main/java/forge/model/FGameState.java
+++ b/src/main/java/forge/model/FGameState.java
@@ -296,6 +296,7 @@ public class FGameState {
         }
         
         getStaticEffects().reset();
+        getTriggerHandler().clearRegistered();
     }
 
 }