diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs
index 775e52ecdb..d0ac12facb 100644
--- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs
+++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs
@@ -365,7 +365,8 @@ public IActionResult SetCourseOptions(EditCourseOptionsFormData model)
             data!.CourseOptionsData = model.ToCourseOptionsTempData();
             multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
-            return RedirectToAction("SetCourseContent", false);
+            bool editCourseContent = data?.EditCourseContent ?? false;
+            return RedirectToAction("SetCourseContent", editCourseContent);
         }
 
         [HttpGet("AddCourse/SetCourseContent")]
@@ -381,7 +382,7 @@ public IActionResult SetCourseContent(bool editCourseContent)
             {
                 return RedirectToAction("Summary");
             }
-            data.EditCourseContent = editCourseContent;
+            data.EditCourseContent = data.EditCourseContent || editCourseContent;
             multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData);
 
             var model = data!.CourseContentData != null