diff --git a/src/core/server/systems/job/system.ts b/src/core/server/systems/job/system.ts
index 9647518f14..72b296e452 100644
--- a/src/core/server/systems/job/system.ts
+++ b/src/core/server/systems/job/system.ts
@@ -271,6 +271,10 @@ export class Job {
      */
     removeAttachable() {
         const objective = this.getCurrentObjective();
+        if ( !objective ) {
+            return;
+        }
+        
         if (!objective.attachable) {
             return;
         }