diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index 0624a8b0e61de77a9bd308a8ecd9e4aa5a3646da..f1295560ef46cff30bc7ebb0ea9b14ea44c23757 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -96,7 +96,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
                 // TODO: factor out the common housekeeping whenever we try to join a room or alias
                 matrixService.roomState(final_room_id).then(
                     function(response) {
-                        eventHandlerService.handleEvents(response, false, true);
+                        eventHandlerService.handleEvents(response.data, false, true);
                     },
                     function(error) {
                         $scope.feedback = "Failed to get room state for: " + final_room_id;
@@ -117,7 +117,7 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
                 // TODO: factor out the common housekeeping whenever we try to join a room or alias
                 matrixService.roomState(response.room_id).then(
                     function(response) {
-                        eventHandlerService.handleEvents(response, false, true);
+                        eventHandlerService.handleEvents(response.data, false, true);
                     },
                     function(error) {
                         $scope.feedback = "Failed to get room state for: " + response.room_id;
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c58d675760774085dc4eb779f2fff9320a4f3a90..ff0f1e05fa85527d588cfb78d1aafa7f2ed76124 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -482,7 +482,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
                                         // TODO: factor out the common housekeeping whenever we try to join a room or alias
                                         matrixService.roomState(response.room_id).then(
                                             function(response) {
-                                                eventHandlerService.handleEvents(response, false, true);
+                                                eventHandlerService.handleEvents(response.data, false, true);
                                             },
                                             function(error) {
                                                 $scope.feedback = "Failed to get room state for: " + response.room_id;
@@ -744,7 +744,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
                             // TODO: factor out the common housekeeping whenever we try to join a room or alias
                             matrixService.roomState($scope.room_id).then(
                                 function(response) {
-                                    eventHandlerService.handleEvents(response, false, true);
+                                    eventHandlerService.handleEvents(response.data, false, true);
                                 },
                                 function(error) {
                                     console.error("Failed to get room state for: " + $scope.room_id);