diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java
index c0fe54d27b..c80cb35b83 100644
--- a/core/src/mindustry/world/blocks/units/Reconstructor.java
+++ b/core/src/mindustry/world/blocks/units/Reconstructor.java
@@ -106,10 +106,10 @@ public class Reconstructor extends UnitBlock{
         @Override
         public boolean acceptPayload(Building source, Payload payload){
             return this.payload == null
-                && this.enabled
+                && (this.enabled || source == this)
                 && relativeTo(source) != rotation
-                && payload instanceof UnitPayload
-                && hasUpgrade(((UnitPayload)payload).unit.type);
+                && payload instanceof UnitPayload pay
+                && hasUpgrade(pay.unit.type);
         }
 
         @Override