diff --git a/synapse/storage/pdu.py b/synapse/storage/pdu.py
index 3cbce2d0a..f780111b3 100644
--- a/synapse/storage/pdu.py
+++ b/synapse/storage/pdu.py
@@ -516,7 +516,7 @@ class StatePduStore(SQLBaseStore):
 
         if not current:
             logger.debug("get_unresolved_state_tree No current state.")
-            return return_value
+            return (return_value, None)
 
         return_value.current_branch.append(current)