diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
index 2b74290b..e9758675 100644
--- a/app/controllers/bbb_controller.rb
+++ b/app/controllers/bbb_controller.rb
@@ -92,7 +92,7 @@ class BbbController < ApplicationController
       if user
         if bbb_res[:returncode] && current_user == user
           JoinMeetingJob.perform_later(user, params[:id], base_url)
-
+          WaitingList.empty(options[:room_owner], options[:meeting_name])
       # user will be waiting for a moderator
         else
           NotifyUserWaitingJob.perform_later(user.encrypted_id, params[:id], params[:name])
diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb
index 420c5747..f68a7897 100644
--- a/app/lib/bbb_api.rb
+++ b/app/lib/bbb_api.rb
@@ -100,8 +100,6 @@ module BbbApi
         rescue BigBlueButton::BigBlueButtonException => exc
           logger.info "BBB error on create #{exc.key}: #{exc.message}"
         end
-        
-        WaitingList.empty(options[:room_owner], options[:meeting_name])
 
         # And then get meeting info
         bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil )