diff --git a/ide/packages/idedebugger/debugger.pp b/ide/packages/idedebugger/debugger.pp
index 91d0a1a2c3..9677533b33 100644
--- a/ide/packages/idedebugger/debugger.pp
+++ b/ide/packages/idedebugger/debugger.pp
@@ -557,6 +557,7 @@ type
                        const AThreadId: Integer;
                        const AStackFrame: Integer
                       );
+    destructor Destroy; override;
     procedure Assign(AnOther: TWatchValue); override;
     property Watch: TIdeWatch read GetWatch;
 
@@ -4596,6 +4597,13 @@ begin
   FStackFrame := AStackFrame;
 end;
 
+destructor TIdeWatchValue.Destroy;
+begin
+  inc(DbgStateChangeCounter);
+  if DbgStateChangeCounter = high(DbgStateChangeCounter) then DbgStateChangeCounter := 0;
+  inherited Destroy;
+end;
+
 procedure TIdeWatchValue.Assign(AnOther: TWatchValue);
 begin
   inherited Assign(AnOther);