diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index 47579f1de3..6a68f73bab 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -45,8 +45,8 @@ public class CoreBlock extends StorageBlock{
         CoreEntity entity = tile.entity();
         Effects.effect(Fx.spawn, entity);
         entity.progress = 0;
-        entity.currentUnit.onRespawn(tile);
         entity.currentUnit = player;
+        entity.currentUnit.onRespawn(tile);
         entity.currentUnit.heal();
         entity.currentUnit.rotation = 90f;
         entity.currentUnit.applyImpulse(0, 8f);