diff --git a/client_code/Tabulator/__init__.py b/client_code/Tabulator/__init__.py
index 9597c83..a7dff12 100644
--- a/client_code/Tabulator/__init__.py
+++ b/client_code/Tabulator/__init__.py
@@ -177,7 +177,10 @@ def set_event_handler(self, event, handler):
         self.add_event_handler(event, handler)
 
     def remove_event_handler(self, event, handler=None):
-        super().remove_event_handler(event, handler)
+        if event is None:
+            super().remove_event_handler(event)
+        else:
+            super().remove_event_handler(event, handler)
         if event in ("show", "hide") or event.startswith("x-"):
             return
         self.off(event, handler)