BF: Wait for the room_id being resolved before starting pagination

1 files changed, 2 insertions, 2 deletions

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 558a865f30..35abeeca06 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -89,7 +89,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
         
     var paginate = function(numItems) {
         // console.log("paginate " + numItems);
-        if ($scope.state.paginating) {
+        if ($scope.state.paginating || !$scope.room_id) {
             return;
         }
         else {
@@ -145,7 +145,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
                 console.log("Failed to paginateBackMessages: " + JSON.stringify(error));
                 $scope.state.paginating = false;
             }
-        )
+        );
     };
 
     var updateMemberList = function(chunk) {