2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/schema/state.sql b/synapse/storage/schema/state.sql
index b5c345fae7..b44c56b519 100644
--- a/synapse/storage/schema/state.sql
+++ b/synapse/storage/schema/state.sql
@@ -14,7 +14,7 @@
  */
 
 CREATE TABLE IF NOT EXISTS state_groups(
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    id INTEGER PRIMARY KEY,
     room_id TEXT NOT NULL,
     event_id TEXT NOT NULL
 );
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index b910646d74..9496c935a7 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -74,7 +74,7 @@ class StateStore(SQLBaseStore):
                 }
             )
 
-            for state in event.state_events:
+            for state in event.state_events.values():
                 self._simple_insert_txn(
                     txn,
                     table="state_groups_state",