diff --git a/app/assets/javascripts/previous_meetings.coffee b/app/assets/javascripts/previous_meetings.coffee
index eb8541d9..44771ad8 100644
--- a/app/assets/javascripts/previous_meetings.coffee
+++ b/app/assets/javascripts/previous_meetings.coffee
@@ -17,6 +17,8 @@
 # Previous Meetings class
 
 class @PreviousMeetings
+  MAX_MEETINGS = 5
+
   @init: (type) ->
     $('.center-panel-wrapper').off 'click', '.fill-meeting-name'
     $('.center-panel-wrapper').on 'click', '.fill-meeting-name', (event, msg) ->
@@ -29,6 +31,8 @@ class @PreviousMeetings
       joinedMeetings = joinedMeetings.split(',')
 
       for m in joinedMeetings by -1
+        if $('ul.previously-joined > li').length > MAX_MEETINGS
+          break
         $('ul.previously-joined').append('<li><a class="fill-meeting-name">'+m+'</a></li>')
 
       $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden')
@@ -44,9 +48,9 @@ class @PreviousMeetings
       names = names.filter( (value) ->
         return $.inArray(value, meetings) == -1
       )
-      for m in names
-        if $('ul.previously-joined').length > 4
-          return
+      for m in meetings
+        if $('ul.previously-joined > li').length > MAX_MEETINGS
+          break
         $('ul.previously-joined').append('<li><a class="fill-meeting-name">'+m+'</a></li>')
 
       $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden')
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index 2a148329..00c4e5aa 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -202,12 +202,14 @@ class @Recordings
       table_api.rows.add(data.recordings)
       @draw()
 
-      recording_names = data.recordings.map (r) ->
-        return r.name
-      output = {}
-      for key in [0...recording_names.length]
-        output[recording_names[key]] = recording_names[key]
-      PreviousMeetings.add(value for key, value of output)
+      if $(".page-wrapper.rooms").data('main-room')
+        recording_names = data.recordings.map (r) ->
+          return r.name
+        output = {}
+        for key in [0...recording_names.length]
+          output[recording_names[key]] = recording_names[key]
+        PreviousMeetings.add(value for key, value of output)
+        
 
   # setup click handlers for the action buttons
   setupActionHandlers: ->