diff --git a/app/models/derived_variables/case_log_variables.rb b/app/models/derived_variables/case_log_variables.rb
index 5c508545c..e63112cb0 100644
--- a/app/models/derived_variables/case_log_variables.rb
+++ b/app/models/derived_variables/case_log_variables.rb
@@ -1,9 +1,13 @@
 module DerivedVariables::CaseLogVariables
   RENT_TYPE_MAPPING = { 0 => 1, 1 => 2, 2 => 2, 3 => 3, 4 => 3, 5 => 3 }.freeze
 
+  def supported_housing_schemes_enabled?
+    FeatureToggle.supported_housing_schemes_enabled?
+  end
+
   def set_derived_fields!
     # TODO: Remove once we support supported housing logs
-    self.needstype = 1 unless needstype
+    self.needstype = 1 unless supported_housing_schemes_enabled?
     if rsnvac.present?
       self.newprop = has_first_let_vacancy_reason? ? 1 : 2
     end