diff --git a/src/js/game/hud/parts/base_toolbar.js b/src/js/game/hud/parts/base_toolbar.js
index 4abace68..2c3f2bf9 100644
--- a/src/js/game/hud/parts/base_toolbar.js
+++ b/src/js/game/hud/parts/base_toolbar.js
@@ -301,6 +301,10 @@ export class HUDBaseToolbar extends BaseHUDPart {
                 this.root.map.removeStaticEntity(entity);
                 entityManager.destroyEntity(entity);
             }
+            const goalComp = entity.components.GoalAcceptor;
+            if (goalComp) {
+                goalComp.clear();
+            }
         }
         entityManager.processDestroyList();