diff --git a/config/initializers/ab_tests.rb b/config/initializers/ab_tests.rb
index 7150e1d1e14..c3b33a45119 100644
--- a/config/initializers/ab_tests.rb
+++ b/config/initializers/ab_tests.rb
@@ -75,8 +75,10 @@ def self.all
   ) do |user:, user_session:, **|
     if user_session&.[](:captcha_validation_performed_at_sign_in) == false
       nil
+    elsif user
+      user.uuid
     else
-      user&.uuid
+      SecureRandom.gen_random(1)
     end
   end.freeze
 end
diff --git a/spec/config/initializers/ab_tests_spec.rb b/spec/config/initializers/ab_tests_spec.rb
index 975e12b1c37..2e9fef97486 100644
--- a/spec/config/initializers/ab_tests_spec.rb
+++ b/spec/config/initializers/ab_tests_spec.rb
@@ -197,8 +197,8 @@
       context 'with no associated user' do
         let(:user) { nil }
 
-        it 'does not return a bucket' do
-          expect(bucket).to be_nil
+        it 'returns a bucket' do
+          expect(bucket).not_to be_nil
         end
       end