diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java
index 5c8d904ea7..fc09a607f6 100644
--- a/core/src/mindustry/ai/types/BuilderAI.java
+++ b/core/src/mindustry/ai/types/BuilderAI.java
@@ -53,6 +53,9 @@ public class BuilderAI extends AIController{
 
         unit.updateBuilding = true;
 
+        if(assistFollowing != null && !assistFollowing.isValid()) assistFollowing = null;
+        if(following != null && !following.isValid()) following = null;
+
         if(assistFollowing != null && assistFollowing.activelyBuilding()){
             following = assistFollowing;
         }