diff --git a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
index 132eca0c2..10fe5752d 100644
--- a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
+++ b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
@@ -7,12 +7,21 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
     @type = "radio"
     @check_answers_card_number = 0
     @hint_text = ""
-    @answer_options = ANSWER_OPTIONS
     @question_number = 14
   end
 
-  ANSWER_OPTIONS = {
-    "1" => { "value" => "Yes", "hint" => "This is a new let." },
-    "0" => { "value" => "No", "hint" => "This is a re-let of existing social housing." },
-  }.freeze
+  def answer_options
+    {
+      "1" => { "value" => "Yes", "hint" => yes_hint },
+      "0" => { "value" => "No", "hint" => no_hint },
+    }.freeze
+  end
+
+  def yes_hint
+    form.start_year_after_2024? ? "This property was previously used for other purposes or is a new-build." : "This is a new let."
+  end
+
+  def no_hint
+    form.start_year_after_2024? ? "This is a re-let of existing social housing stock." : "This is a re-let of existing social housing."
+  end
 end
diff --git a/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb b/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb
new file mode 100644
index 000000000..8f0f5c2b7
--- /dev/null
+++ b/spec/models/form/lettings/pages/first_time_property_let_as_social_housing_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Pages::FirstTimePropertyLetAsSocialHousing, type: :model do
+  subject(:page) { described_class.new(page_id, page_definition, subsection) }
+
+  let(:page_id) { nil }
+  let(:page_definition) { nil }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+    allow(subsection).to receive(:form).and_return(form)
+  end
+
+  it "has correct subsection" do
+    expect(page.subsection).to eq(subsection)
+  end
+
+  it "has correct questions" do
+    expect(page.questions.map(&:id)).to eq(%w[first_time_property_let_as_social_housing])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("first_time_property_let_as_social_housing")
+  end
+
+  it "has the correct header" do
+    expect(page.header).to be_nil
+  end
+
+  it "has the correct description" do
+    expect(page.description).to be_nil
+  end
+
+  it "has the correct depends_on" do
+    expect(page.depends_on).to eq([{ "is_renewal?" => false }])
+  end
+end
diff --git a/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb b/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb
new file mode 100644
index 000000000..e88c4ac8b
--- /dev/null
+++ b/spec/models/form/lettings/questions/first_time_property_let_as_social_housing_spec.rb
@@ -0,0 +1,47 @@
+require "rails_helper"
+
+RSpec.describe Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing, type: :model do
+  subject(:question) { described_class.new(question_id, question_definition, page) }
+
+  let(:question_id) { nil }
+  let(:question_definition) { nil }
+  let(:page) { instance_double(Form::Page) }
+  let(:subsection) { instance_double(Form::Subsection) }
+  let(:form) { instance_double(Form) }
+
+  before do
+    allow(form).to receive(:start_year_after_2024?).and_return(false)
+    allow(page).to receive(:subsection).and_return(subsection)
+    allow(subsection).to receive(:form).and_return(form)
+  end
+
+  it "has correct page" do
+    expect(question.page).to eq(page)
+  end
+
+  it "has the correct id" do
+    expect(question.id).to eq("first_time_property_let_as_social_housing")
+  end
+
+  context "with 2023/24 form" do
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Yes", "hint" => "This is a new let." },
+        "0" => { "value" => "No", "hint" => "This is a re-let of existing social housing." },
+      })
+    end
+  end
+
+  context "with 2024/25 form" do
+    before do
+      allow(form).to receive(:start_year_after_2024?).and_return(true)
+    end
+
+    it "has the correct answer_options" do
+      expect(question.answer_options).to eq({
+        "1" => { "value" => "Yes", "hint" => "This property was previously used for other purposes or is a new-build." },
+        "0" => { "value" => "No", "hint" => "This is a re-let of existing social housing stock." },
+      })
+    end
+  end
+end