diff --git a/pynecone/state.py b/pynecone/state.py
index 19d152672..7e1fc292c 100644
--- a/pynecone/state.py
+++ b/pynecone/state.py
@@ -182,9 +182,7 @@ class State(Base, ABC):
             for name, fn in cls.__dict__.items()
             if not name.startswith("_") and isinstance(fn, Callable)
         }
-        for name, fn in events.items():
-            event_handler = EventHandler(fn=fn)
-            cls.event_handlers[name] = event_handler
+        cls.event_handlers = {name: EventHandler(fn=fn) for name, fn in events.items()}
 
         cls.set_handlers()
 
diff --git a/tests/test_state.py b/tests/test_state.py
index 500d34ba9..14f4c71cb 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -211,20 +211,15 @@ def test_event_handlers(test_state):
         test_state: A state.
     """
     expected = {
-        "change_both",
-        "do_nothing",
         "do_something",
         "set_array",
         "set_complex",
-        "set_count",
         "set_fig",
         "set_key",
         "set_mapping",
         "set_num1",
         "set_num2",
         "set_obj",
-        "set_value",
-        "set_value2",
     }
 
     cls = type(test_state)