diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 2bf7ce966..635dc12e4 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -250,7 +250,9 @@ private
   def check_collection_period
     return unless @log
 
-    redirect_to lettings_log_path(@log) unless @log.collection_period_open_for_editing?
+    unless @log.collection_period_open_for_editing?
+      redirect_to @log.lettings? ? lettings_log_path(@log) : sales_log_path(@log)
+    end
   end
 
   CONFIRMATION_PAGE_IDS = %w[uprn_confirmation uprn_selection].freeze
diff --git a/spec/requests/form_controller_spec.rb b/spec/requests/form_controller_spec.rb
index ca558ddc4..bc491a78e 100644
--- a/spec/requests/form_controller_spec.rb
+++ b/spec/requests/form_controller_spec.rb
@@ -358,6 +358,12 @@ RSpec.describe FormController, type: :request do
         created_by: user,
       )
     end
+    let!(:sales_log) do
+      create(
+        :sales_log,
+        created_by: user,
+      )
+    end
 
     before do
       allow(user).to receive(:need_two_factor_authentication?).and_return(false)
@@ -612,6 +618,104 @@ RSpec.describe FormController, type: :request do
               expect(page).to have_content("There is a problem")
             end
           end
+
+          context "when allow_future_form_use? is enabled" do
+            before do
+              allow(FeatureToggle).to receive(:allow_future_form_use?).and_return(true)
+            end
+
+            context "when the tenancy start date is out of the editable collection year" do
+              let(:page_id) { "tenancy_start_date" }
+              let(:params) do
+                {
+                  id: lettings_log.id,
+                  lettings_log: {
+                    page: page_id,
+                    "startdate(3i)" => 1,
+                    "startdate(2i)" => 1,
+                    "startdate(1i)" => 1,
+                  },
+                }
+              end
+
+              it "redirects to the review page for the log" do
+                post "/lettings-logs/#{lettings_log.id}/#{page_id.dasherize}", params: params
+                follow_redirect!
+                follow_redirect!
+                follow_redirect!
+                expect(page).to have_content("Review lettings log")
+              end
+            end
+
+            context "when the sale date is out of the editable collection year" do
+              let(:page_id) { "completion_date" }
+              let(:params) do
+                {
+                  id: sales_log.id,
+                  sales_log: {
+                    page: page_id,
+                    "saledate(3i)" => 1,
+                    "saledate(2i)" => 1,
+                    "saledate(1i)" => 1,
+                  },
+                }
+              end
+
+              it "redirects to the review page for the log" do
+                post "/sales-logs/#{sales_log.id}/#{page_id.dasherize}", params: params
+                follow_redirect!
+                follow_redirect!
+                follow_redirect!
+                expect(page).to have_content("Review sales log")
+              end
+            end
+          end
+
+          context "when allow_future_form_use? is disabled" do
+            before do
+              allow(FeatureToggle).to receive(:allow_future_form_use?).and_return(false)
+            end
+
+            context "when the tenancy start date is out of the editable collection year" do
+              let(:page_id) { "tenancy_start_date" }
+              let(:params) do
+                {
+                  id: lettings_log.id,
+                  lettings_log: {
+                    page: page_id,
+                    "startdate(3i)" => 1,
+                    "startdate(2i)" => 1,
+                    "startdate(1i)" => 1,
+                  },
+                }
+              end
+
+              it "validates the date correctly" do
+                post "/lettings-logs/#{lettings_log.id}/#{page_id.dasherize}", params: params
+                expect(page).to have_content("There is a problem")
+              end
+            end
+
+            context "when the sale date is out of the editable collection year" do
+              let(:page_id) { "completion_date" }
+              let(:params) do
+                {
+                  id: sales_log.id,
+                  sales_log: {
+                    page: page_id,
+                    "saledate(3i)" => 1,
+                    "saledate(2i)" => 1,
+                    "saledate(1i)" => 1,
+                  },
+                }
+              end
+
+              it "validates the date correctly" do
+                post "/sales-logs/#{sales_log.id}/#{page_id.dasherize}", params: params
+                expect(page).to have_content("There is a problem")
+              end
+            end
+          end
         end
 
         context "with invalid organisation answers" do