diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
index 0801f042b2..71bba8e419 100644
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
@@ -144,7 +144,7 @@ public class Unloader extends Block{
 
                 //partial check
                 boolean canLoad = !(other instanceof CoreBuild || other instanceof StorageBuild);
-                boolean canUnload = other.canUnload() && (allowCoreUnload || canLoad) && other.items != null;
+                boolean canUnload = other.canUnload() && (allowCoreUnload || canLoad || (other instanceof StorageBuild b && b.linkedCore == null)) && other.items != null;
 
                 if(canLoad || canUnload){ //avoid blocks that can neither give nor receive items
                     var pb = Pools.obtain(ContainerStat.class, ContainerStat::new);