diff --git a/core/src/main/java/com/sk89q/worldedit/LocalSession.java b/core/src/main/java/com/sk89q/worldedit/LocalSession.java
index 0316cd9d..87707962 100644
--- a/core/src/main/java/com/sk89q/worldedit/LocalSession.java
+++ b/core/src/main/java/com/sk89q/worldedit/LocalSession.java
@@ -439,11 +439,11 @@ public class LocalSession {
     }
 
     public void remember(final EditSession editSession, final boolean append, final boolean sendMessage, int limitMb) {
+        // It should have already been flushed, but just in case!
+        editSession.flushQueue();
         if (editSession == null || editSession.getChangeSet() == null || limitMb == 0 || ((historySize >> 20) > limitMb && !append)) {
             return;
         }
-        // It should have already been flushed, but just in case!
-        editSession.flushQueue();
         // Don't store anything if no changes were made
         if (editSession.size() == 0 || editSession.hasFastMode()) {
             return;