diff --git a/CHANGELOG.md b/CHANGELOG.md
index e328868e..29a17475 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to the Reactodia will be documented in this document.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+#### 🐛 Fixed
+- Fix `AnnotationSupport` not unsubscribing from `AnnotationTopic` at unmount which causes tow annotations to be created from `SelectionActionAnnotate` in React development mode.
 
 ## [0.31.1] - 2025-11-18
 #### 🐛 Fixed
diff --git a/src/widgets/annotation/annotationSupport.tsx b/src/widgets/annotation/annotationSupport.tsx
index 1d24009a..b135bb48 100644
--- a/src/widgets/annotation/annotationSupport.tsx
+++ b/src/widgets/annotation/annotationSupport.tsx
@@ -141,6 +141,7 @@ export function AnnotationSupport(props: AnnotationSupportProps) {
             batch.store();
             canvas.renderingState.syncUpdate();
         });
+        return () => listener.stopListening();
     }, []);
 
     return (