diff --git a/app/controllers/concerns/populator.rb b/app/controllers/concerns/populator.rb
index dd86d314ad6f0ef2e314f876a7be8fcbd4859eaf..b3ee72938f3ef469751af56ed3d8ebf4f8300048 100644
--- a/app/controllers/concerns/populator.rb
+++ b/app/controllers/concerns/populator.rb
@@ -90,7 +90,8 @@ module Populator
 
   # Returns exactly 1 page of the latest recordings
   def latest_recordings
-    return_length = Rails.configuration.pagination_number
+    return_length = Rails.configuration.pagination_rows
+    number_of_rooms = Rails.configuration.pagination_number
     recordings = []
     counter = 0
 
@@ -100,8 +101,8 @@ module Populator
         Room.includes(:owner)
             .where(users: { provider: @user_domain })
             .order(last_session: :desc)
-            .limit(return_length)
-            .offset(counter * return_length)
+            .limit(number_of_rooms)
+            .offset(counter * number_of_rooms)
             .pluck(:bbb_id)
       else
         Room.order(last_session: :desc)
diff --git a/app/controllers/concerns/recorder.rb b/app/controllers/concerns/recorder.rb
index 0365fb2dd5a7bb6c600644f494ca0fb10530af17..686079777ca59ae705ba6c0b13177d7c0fe5af4b 100644
--- a/app/controllers/concerns/recorder.rb
+++ b/app/controllers/concerns/recorder.rb
@@ -37,7 +37,7 @@ module Recorder
   def all_recordings(room_bbb_ids, search_params = {}, ret_search_params = false, search_name = false)
     res = { recordings: [] }
 
-    until room_bbb_ids.empty? || res[:recordings].length > Rails.configuration.pagination_number
+    until room_bbb_ids.empty?
       # bbb.get_recordings returns an object
       # take only the array portion of the object that is returned
       full_res = get_multiple_recordings(room_bbb_ids.pop(Rails.configuration.pagination_number))