diff --git a/app/models/derived_variables/lettings_log_variables.rb b/app/models/derived_variables/lettings_log_variables.rb
index 4666a47ae..3aae12b4c 100644
--- a/app/models/derived_variables/lettings_log_variables.rb
+++ b/app/models/derived_variables/lettings_log_variables.rb
@@ -71,6 +71,9 @@ module DerivedVariables::LettingsLogVariables
     if form.start_year_2024_or_later? && is_bedsit?
       self.beds = 1
     end
+    if bedsit_changed_to_not_bedsit? # make user answer num of bedrooms again
+      self.beds = nil
+    end
 
     clear_child_ecstat_for_age_changes!
     child_under_16_constraints!
diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb
index 18b26ad85..a31cfab61 100644
--- a/app/models/derived_variables/sales_log_variables.rb
+++ b/app/models/derived_variables/sales_log_variables.rb
@@ -83,6 +83,9 @@ module DerivedVariables::SalesLogVariables
     if form.start_year_2025_or_later? && is_bedsit?
       self.beds = 1
     end
+    if bedsit_changed_to_not_bedsit? # make user answer num of bedrooms again
+      self.beds = nil
+    end
 
     self.nationality_all = nationality_all_group if nationality_uk_or_prefers_not_to_say?
     self.nationality_all_buyer2 = nationality_all_buyer2_group if nationality2_uk_or_prefers_not_to_say?
diff --git a/app/models/lettings_log.rb b/app/models/lettings_log.rb
index 1daf7cd9a..6b1768f11 100644
--- a/app/models/lettings_log.rb
+++ b/app/models/lettings_log.rb
@@ -399,6 +399,10 @@ class LettingsLog < Log
     form.start_year_2024_or_later? && is_bedsit?
   end
 
+  def bedsit_changed_to_not_bedsit?
+    unittype_gn_changed? && unittype_gn_was == 2
+  end
+
   def is_shared_housing?
     # 4: Shared flat or maisonette
     # 9: Shared house
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 0fdcf6d14..d4d23f44d 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -386,6 +386,10 @@ class SalesLog < Log
     form.start_year_2025_or_later? && is_bedsit?
   end
 
+  def bedsit_changed_to_not_bedsit?
+    proptype_changed? && proptype_was == 2
+  end
+
   def shared_ownership_scheme?
     ownershipsch == 1
   end