diff --git a/ee/spec/features/registrations/saas/invite_flow_spec.rb b/ee/spec/features/registrations/saas/invite_flow_spec.rb
index d9f59f9995407f5d88b044e5a144be78c4515fec..88770237cda43eabfd01d4d33be5cd62f5c8a294 100644
--- a/ee/spec/features/registrations/saas/invite_flow_spec.rb
+++ b/ee/spec/features/registrations/saas/invite_flow_spec.rb
@@ -4,7 +4,7 @@
 
 RSpec.describe 'SaaS registration from an invite', :js, :saas_registration, :sidekiq_inline, feature_category: :onboarding do
   it 'registers the user and sends them to the group page' do
-    group = create(:group, name: 'Test Group')
+    group = create(:group, name: 'Test Group', organization: create(:organization))
 
     registers_from_invite(group: group)
 
@@ -19,7 +19,7 @@
   end
 
   it 'registers the user with identity verification and sends them to the group page' do
-    group = create(:group, name: 'Test Group')
+    group = create(:group, name: 'Test Group', organization: create(:organization))
 
     registers_from_invite_with_arkose(group: group)
 
@@ -40,7 +40,7 @@
   end
 
   it 'registers the user with multiple invites and sends them to the last group page' do
-    group = create(:group, name: 'Test Group')
+    group = create(:group, name: 'Test Group', organization: create(:organization))
 
     create(
       :group_member,
@@ -64,7 +64,7 @@
 
   context 'when the invite email is not lowercased' do
     it 'registers the user and sends them to the group page' do
-      group = create(:group, name: 'Test Group')
+      group = create(:group, name: 'Test Group', organization: create(:organization))
 
       registers_from_invite(group: group, invite_email: user_email.upcase)
 
diff --git a/ee/spec/features/registrations/saas/sso_signin_standard_flow_company_creating_project_spec.rb b/ee/spec/features/registrations/saas/sso_signin_standard_flow_company_creating_project_spec.rb
index 2737256bb5a8fd9e5b31d853fd15651079baae5a..4cf0ee2b9357cb46ed32d1509cd7f9e0830798db 100644
--- a/ee/spec/features/registrations/saas/sso_signin_standard_flow_company_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/sso_signin_standard_flow_company_creating_project_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'Single sign on for signing up through sign in flow for user picking company and creating a project', :js, :saas_registration, feature_category: :onboarding do
-  context 'when opting into a trial' do
+  context 'when opting into a trial', :with_default_organization do
     it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
       sso_signup_through_signin
 
diff --git a/ee/spec/features/registrations/saas/standard_flow_company_creating_project_spec.rb b/ee/spec/features/registrations/saas/standard_flow_company_creating_project_spec.rb
index 2746e368a10c3ffd16b8a0a2347ad789ec63c2aa..47c9144c56217e058e5a027c0363f83e2b42b44f 100644
--- a/ee/spec/features/registrations/saas/standard_flow_company_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/standard_flow_company_creating_project_spec.rb
@@ -11,7 +11,7 @@
   end
 
   with_them do
-    context 'when opting into a trial' do
+    context 'when opting into a trial', :with_default_organization do
       it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
         sign_up_method.call(glm_params)
 
@@ -37,7 +37,7 @@
     end
   end
 
-  context 'when last name is missing for SSO and has to be filled in' do
+  context 'when last name is missing for SSO and has to be filled in', :with_default_organization do
     it 'registers the user, has some lead submission failures and creates a group and project reaching onboarding' do
       sso_sign_up(name: 'Registering')
 
diff --git a/ee/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb b/ee/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
index 6e26b943fdef64ef9c49aa8888871a6d38d8c261..aac87687b3d1d158041930a71a455827498bbdad 100644
--- a/ee/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/standard_flow_just_me_creating_project_spec.rb
@@ -11,7 +11,8 @@
   end
 
   with_them do
-    it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
+    it 'registers the user and creates a group and project reaching onboarding', :with_default_organization,
+      :sidekiq_inline do
       sign_up_method.call
 
       expect_to_see_welcome_form
@@ -30,7 +31,7 @@
   end
 
   context 'when template was selected' do
-    it 'creates a project from given template', :sidekiq_inline do
+    it 'creates a project from given template', :with_default_organization, :sidekiq_inline do
       stub_experiments(project_templates_during_registration: :candidate)
       regular_sign_up
 
diff --git a/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb b/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
index 02550b4b85b063a4acd7bc51555351191237d2dd..4c16bfcdbbb03c104ae76a9024f336594fd6129c 100644
--- a/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/trial_flow_company_creating_project_spec.rb
@@ -11,7 +11,8 @@
   end
 
   with_them do
-    it 'registers the user and creates a group and project reaching onboarding', :snowplow_micro, :sidekiq_inline do
+    it 'registers the user and creates a group and project reaching onboarding', :with_default_organization,
+      :snowplow_micro, :sidekiq_inline do
       sign_up_method.call(glm_params)
 
       ensure_onboarding { expect_to_see_welcome_form }
@@ -42,7 +43,8 @@
   end
 
   context 'when last name is missing for SSO and has to be filled in' do
-    it 'registers the user, creates a group and project reaching onboarding', :sidekiq_inline do
+    it 'registers the user, creates a group and project reaching onboarding', :with_default_organization,
+      :sidekiq_inline do
       sso_trial_registration_sign_up(name: 'Registering')
 
       ensure_onboarding { expect_to_see_welcome_form }
diff --git a/ee/spec/features/registrations/saas/trial_flow_just_me_creating_project_spec.rb b/ee/spec/features/registrations/saas/trial_flow_just_me_creating_project_spec.rb
index e4bdce07eccd6ba789a65d3e3611d20d2d1dd1b7..43551502cc3cf1507b77583c5d962f5c467008fc 100644
--- a/ee/spec/features/registrations/saas/trial_flow_just_me_creating_project_spec.rb
+++ b/ee/spec/features/registrations/saas/trial_flow_just_me_creating_project_spec.rb
@@ -11,7 +11,8 @@
   end
 
   with_them do
-    it 'registers the user and creates a group and project reaching onboarding', :sidekiq_inline do
+    it 'registers the user and creates a group and project reaching onboarding', :with_default_organization,
+      :sidekiq_inline do
       sign_up_method.call(glm_params)
 
       expect_to_see_welcome_form
diff --git a/spec/support/shared_contexts/current_organization_context.rb b/spec/support/shared_contexts/current_organization_context.rb
index d43d8ff82fe99e7246f1e61999cd81d5993a1392..12a460706dc7c489fa9795b927f01a52dea3a980 100644
--- a/spec/support/shared_contexts/current_organization_context.rb
+++ b/spec/support/shared_contexts/current_organization_context.rb
@@ -6,7 +6,8 @@
   let_it_be(:current_organization, reload: true) { create(:organization, name: 'Current Organization') }
 
   before do
-    Current.organization = current_organization
+    allow(Current).to receive(:organization).and_return(current_organization)
+    allow(Current).to receive(:organization_id).and_return(current_organization.id)
   end
 
   after do
diff --git a/spec/support/shared_contexts/default_organization_context.rb b/spec/support/shared_contexts/default_organization_context.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7252369d919a3ba32f46beee863940a2a6196662
--- /dev/null
+++ b/spec/support/shared_contexts/default_organization_context.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'with default_organization setting', shared_context: :metadata do # rubocop:disable RSpec/SharedGroupsMetadata -- We are actually using this for easy metadata setting
+  let_it_be(:default_organization) { create(:organization, :default) }
+end
+
+RSpec.configure do |rspec|
+  rspec.include_context 'with default_organization setting', with_default_organization: true
+end