1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 489b6bd171..5cb26ad6db 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -288,7 +288,8 @@ class SQLBaseStore(object):
 
     def _parse_event_from_row(self, row_dict):
         d = copy.deepcopy({k: v for k, v in row.items() if v})
-        d.update(json.loads(row["unrecognized_keys"]))
+        d.update(json.loads(json.loads(row["unrecognized_keys"])))
+        d["content"] = json.loads(d["content"})
         del d["unrecognized_keys"]
 
         return self.event_factory.create_event(