diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
index 178e37380..bebb9b9e8 100644
--- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb
+++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb
@@ -99,6 +99,11 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do
 
       @hook_request = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}"
       @hooks = JSON.parse(@hook_request)
+      if @hooks['hooked-browsers']['online'].empty?
+        @session = @driver.execute_script("return window.beef.session.get_hook_session_id()")
+      else
+        @session = @hooks['hooked-browsers']['online'][0]
+      end
     rescue => exception
       print_info "Exception: #{exception}"
       print_info "Exception Class: #{exception.class}"
diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb
index a9429cd8b..b1208398e 100644
--- a/spec/beef/modules/debug/test_beef_debugs_spec.rb
+++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb
@@ -98,6 +98,12 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do
 
         @hook_request = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}"
         @hooks = JSON.parse(@hook_request)
+        
+        if @hooks['hooked-browsers']['online'].empty?
+          @session = @driver.execute_script("return window.beef.session.get_hook_session_id()")
+        else
+          @session = @hooks['hooked-browsers']['online'][0]
+        end
 
         # Grab Command Module IDs as they can differ from machine to machine
         @debug_mod_ids = JSON.parse(RestClient.get "#{RESTAPI_MODULES}?token=#{@token}")