diff --git a/app/models/big_blue_button_conference.rb b/app/models/big_blue_button_conference.rb
index 2f2d2c686829..b3b9aee26f7c 100644
--- a/app/models/big_blue_button_conference.rb
+++ b/app/models/big_blue_button_conference.rb
@@ -242,7 +242,11 @@ def self.generate_request(action, options, use_fallback_config: false)
     config_to_use = (use_fallback_config && fallback_config.presence) || config
     query_string = options.to_query
     query_string << ("&checksum=" + Digest::SHA1.hexdigest(action.to_s + query_string + config_to_use[:secret_dec]))
-    "https://#{config_to_use[:domain]}/bigbluebutton/api/#{action}?#{query_string}"
+    if config_to_use[:domain].match(/^https?:\/\//)
+      "#{config_to_use[:domain].sub(/(\/api)?\/?$/, '/api/')}#{action}?#{query_string}"
+    else
+      "https://#{config_to_use[:domain]}/bigbluebutton/api/#{action}?#{query_string}"
+    end
   end
 
   def send_request(action, options)