diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index d69eb32f4151..79799d774f90 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -959,7 +959,15 @@ async def create_new_client_event(
             event.internal_metadata.outlier = True
             context = EventContext.for_outlier()
         else:
-            context = await self.state.compute_event_context(event)
+            old_state = None
+            # Define the state for historical messages while we know to get all of
+            # state_groups setup properly when we `compute_event_context`.
+            if builder.internal_metadata.is_historical() and auth_event_ids:
+                old_state = await self.store.get_events_as_list(auth_event_ids)
+
+            context = await self.state.compute_event_context(event, old_state=old_state)
+
+        logger.info("create_new_client_event type=%s, event_id=%s context=%s", event.type, event.event_id, context)
 
         if requester:
             context.app_service = requester.app_service
diff --git a/synapse/rest/client/room_batch.py b/synapse/rest/client/room_batch.py
index 1dffcc314793..ab5460fc065f 100644
--- a/synapse/rest/client/room_batch.py
+++ b/synapse/rest/client/room_batch.py
@@ -176,6 +176,8 @@ async def _create_requester_for_user_id_from_app_service(
     async def on_POST(
         self, request: SynapseRequest, room_id: str
     ) -> Tuple[int, JsonDict]:
+        logger.info("room batch send =====================================================")
+        logger.info("=====================================================================")
         requester = await self.auth.get_user_by_req(request, allow_guest=False)
 
         if not requester.app_service: