diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 01d3f76bb77..53be6f33837 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -319,6 +319,7 @@ class Recorder(threading.Thread):
                     with session_scope(session=self.get_session()) as session:
                         dbevent = Events.from_event(event)
                         session.add(dbevent)
+                        session.flush()
 
                         if event.event_type == EVENT_STATE_CHANGED:
                             dbstate = States.from_event(event)
diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py
index 58b8dc1f839..191c0d6e733 100644
--- a/tests/components/recorder/test_init.py
+++ b/tests/components/recorder/test_init.py
@@ -42,6 +42,7 @@ class TestRecorder(unittest.TestCase):
         with session_scope(hass=self.hass) as session:
             db_states = list(session.query(States))
             assert len(db_states) == 1
+            assert db_states[0].event_id > 0
             state = db_states[0].to_native()
 
         assert state == self.hass.states.get(entity_id)