diff --git a/app/models/form/setup/questions/created_by_id.rb b/app/models/form/setup/questions/created_by_id.rb
index 72e251f26..1342ef34f 100644
--- a/app/models/form/setup/questions/created_by_id.rb
+++ b/app/models/form/setup/questions/created_by_id.rb
@@ -12,6 +12,8 @@ class Form::Setup::Questions::CreatedById < ::Form::Question
 
   def answer_options_values
     answer_opts = { "" => "Select an option" }
+    return answer_opts unless ActiveRecord::Base.connected?
+
     User.all.each_with_object(answer_opts) do |user, hsh|
       hsh[user.id] = user.name
       hsh
diff --git a/app/models/form/setup/questions/owning_organisation_id.rb b/app/models/form/setup/questions/owning_organisation_id.rb
index f48ee9fdd..c26aa6d16 100644
--- a/app/models/form/setup/questions/owning_organisation_id.rb
+++ b/app/models/form/setup/questions/owning_organisation_id.rb
@@ -12,6 +12,8 @@ class Form::Setup::Questions::OwningOrganisationId < ::Form::Question
 
   def answer_options_values
     answer_opts = { "" => "Select an option" }
+    return answer_opts unless ActiveRecord::Base.connected?
+
     Organisation.all.each_with_object(answer_opts) do |organisation, hsh|
       hsh[organisation.id] = organisation.name
       hsh
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index c06b0565a..b8959ca88 100644
--- a/spec/models/form_handler_spec.rb
+++ b/spec/models/form_handler_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe FormHandler do
       form_handler = described_class.instance
       form = form_handler.get_form(test_form_name)
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(43)
+      expect(form.pages.count).to eq(42)
     end
   end