diff --git a/packages/text-annotator/src/SelectionHandler.ts b/packages/text-annotator/src/SelectionHandler.ts
index 2027fc4d..905f2397 100644
--- a/packages/text-annotator/src/SelectionHandler.ts
+++ b/packages/text-annotator/src/SelectionHandler.ts
@@ -27,7 +27,16 @@ export const createSelectionHandler = (
 
   let currentAnnotatingEnabled = true;
 
-  const setAnnotatingEnabled = (enabled: boolean) => currentAnnotatingEnabled = enabled;
+  const setAnnotatingEnabled = (enabled: boolean) => {
+    currentAnnotatingEnabled = enabled;
+
+    if (!enabled) {
+      currentTarget = undefined;
+      lastPointerDown = undefined;
+
+      onSelectionChange.clear();
+    }
+  };
 
   const { store, selection } = state;