diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 04686cff9c..3e370b546f 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -213,6 +213,7 @@ function returnStateEvent(event, roomId, eventType, stateKey) {
     const stateEvent = room.currentState.getStateEvents(eventType, stateKey);
     if (!stateEvent) {
         sendResponse(event, null);
+        return;
     }
     sendResponse(event, stateEvent.getContent());
 }