diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
index 508c0dd8a..e1202cf06 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -530,7 +530,13 @@ public class EditSession extends AbstractDelegateExtent implements HasFaweQueue,
         this.extent = nullExtent;
         bypassAll = nullExtent;
         dequeue();
-        queue.clear();
+        if (!queue.isEmpty()) {
+            if (Fawe.isMainThread()) {
+                queue.clear();
+            } else {
+                SetQueue.IMP.addTask(() -> queue.clear());
+            }
+        }
         return true;
     }