diff --git a/app/assets/javascripts/meetings.js b/app/assets/javascripts/meetings.js
index cd70874d..e2e8a681 100644
--- a/app/assets/javascripts/meetings.js
+++ b/app/assets/javascripts/meetings.js
@@ -21,7 +21,7 @@ let rendered = false;
 let loadedMeetingId = null;
 
 // Max time to wait for ajax response
-let ajaxTimeout = 5000;
+let ajaxTimeout = 15000;
 
 /* This is invoked only in 1 situations:
  * 1. When clicking on the link 'Meetings' in the Room view
diff --git a/lib/bbb_api.rb b/lib/bbb_api.rb
index 0ac7e788..40130533 100644
--- a/lib/bbb_api.rb
+++ b/lib/bbb_api.rb
@@ -267,9 +267,11 @@ def bbb(room, internal = true)
     end
 
     # BigBlueButtonApi.new(url, secret, version=nil, logger=nil)
-    BigBlueButton::BigBlueButtonApi.new(
+    api = BigBlueButton::BigBlueButtonApi.new(
       remove_slash(fix_bbb_endpoint_format(endpoint)), secret, "0.9", Rails.logger
     )
+    api.timeout = 15
+    api
   end
 
   # Fixes BigBlueButton endpoint ending.