diff --git a/src/project.ts b/src/project.ts
index ae4cb46..0acfa21 100644
--- a/src/project.ts
+++ b/src/project.ts
@@ -154,6 +154,7 @@ export default class Project extends TypedEventTarget<CreateMonitorEvent | Quest
                 target.destroy();
             }
         }
+        this.cloneCount = 0;
         this.targets.length = nextOriginalTargetIndex;
         // Reset timer when the project is stopped
         this.timerStart = this.currentMSecs;
@@ -219,6 +220,10 @@ export default class Project extends TypedEventTarget<CreateMonitorEvent | Quest
         const index = this.targets.indexOf(target);
         if (index === -1) return;
 
+        if (!target.isOriginal) {
+            this.cloneCount--;
+        }
+
         this.targets.splice(index, 1);
         target.destroy();
     }