diff --git a/fastplotlib/graphics/selectors/_base_selector.py b/fastplotlib/graphics/selectors/_base_selector.py
index e892ca32d..e6796f270 100644
--- a/fastplotlib/graphics/selectors/_base_selector.py
+++ b/fastplotlib/graphics/selectors/_base_selector.py
@@ -252,7 +252,8 @@ def _move_end(self, ev):
 
         # restore the initial controller state
         # if it was disabled, keep it disabled
-        self._plot_area.controller.enabled = self._initial_controller_state
+        if self._initial_controller_state is not None:
+            self._plot_area.controller.enabled = self._initial_controller_state
 
     def _move_to_pointer(self, ev):
         """