diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
index 709fa6f12..a8eb4d8bb 100644
--- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
+++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java
@@ -47,6 +47,7 @@ import org.bukkit.util.Vector;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 
 public class JigsawEditor implements Listener {
     public static final KMap<Player, JigsawEditor> editors = new KMap<>();
@@ -162,9 +163,15 @@ public class JigsawEditor implements Listener {
     public void exit() {
         J.car(ticker);
         Iris.instance.unregisterListener(this);
-        object.unplaceCenterY(origin);
+        try {
+            J.sfut(() -> {
+                object.unplaceCenterY(origin);
+                falling.v().forEach(Runnable::run);
+            }).get();
+        } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+        }
         editors.remove(player);
-        falling.v().forEach(Runnable::run);
     }
 
     public void onTick() {
diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
index 6ea5ea4f6..edf782563 100644
--- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
+++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
@@ -20,6 +20,7 @@ package com.volmit.iris.engine.jigsaw;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.edit.JigsawEditor;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.object.IObjectPlacer;