diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb
index 8cae51405..dc6179b21 100644
--- a/app/models/form/lettings/questions/stock_owner.rb
+++ b/app/models/form/lettings/questions/stock_owner.rb
@@ -26,7 +26,7 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     user_answer_options = if user.support?
                             Organisation.where(holds_own_stock: true)
                           else
-                            user.organisation.stock_owners + user.organisation.absorbed_organisations
+                            user.organisation.stock_owners + user.organisation.absorbed_organisations.where(holds_own_stock: true)
                           end.pluck(:id, :name).to_h
 
     answer_opts.merge(user_answer_options)
diff --git a/db/schema.rb b/db/schema.rb
index 75282b2bd..ee5c1c1ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_07_18_151955) do
+ActiveRecord::Schema[7.0].define(version: 2023_07_25_081029) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -434,6 +434,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_18_151955) do
     t.string "old_org_id"
     t.string "old_visible_id"
     t.datetime "merge_date"
+    t.bigint "absorbing_organisation_id"
+    t.index ["absorbing_organisation_id"], name: "index_organisations_on_absorbing_organisation_id"
     t.index ["old_visible_id"], name: "index_organisations_on_old_visible_id", unique: true
   end
 
@@ -715,6 +717,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_18_151955) do
   add_foreign_key "locations", "schemes"
   add_foreign_key "organisation_relationships", "organisations", column: "child_organisation_id"
   add_foreign_key "organisation_relationships", "organisations", column: "parent_organisation_id"
+  add_foreign_key "organisations", "organisations", column: "absorbing_organisation_id"
   add_foreign_key "sales_logs", "organisations", column: "owning_organisation_id", on_delete: :cascade
   add_foreign_key "schemes", "organisations", column: "owning_organisation_id", on_delete: :cascade
   add_foreign_key "users", "organisations", on_delete: :cascade