diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 3cf2f7cff8..066e1aab75 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -594,7 +594,6 @@ class EventsStore(SQLBaseStore):
             ],
             consumeErrors=True
         )
-        logger.debug("gatherResults after")
 
         defer.returnValue({
             e.event_id: e
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 3f5642642d..b3f2a4dfa1 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -159,11 +159,12 @@ class StateStore(SQLBaseStore):
                 args = (room_id, )
 
             txn.execute(sql, args)
-            results = self.cursor_to_dict(txn)
+            results = txn.fetchall()
 
-            return self._parse_events_txn(txn, results)
+            return [r[0] for r in results]
 
-        events = yield self.runInteraction("get_current_state", f)
+        event_ids = yield self.runInteraction("get_current_state", f)
+        events = yield self._get_events(event_ids)
         defer.returnValue(events)