diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
index b353490b19..a599e16c08 100644
--- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
+++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs
@@ -438,6 +438,11 @@ public IActionResult SelectFrameworkSources(SelectFrameworkSourcesFormData model
                 competencyAssessmentService.InsertSelfAssessmentFramework(adminId, competencyAssessmentId, model.FrameworkId.Value);
                 return RedirectToAction("SelectFrameworkSources", new { competencyAssessmentId, actionName = "Summary" });
             }
+            else if (actionName == "ViewSelected")
+            {
+                competencyAssessmentService.InsertSelfAssessmentFramework(adminId, competencyAssessmentId, model.FrameworkId.Value);
+                return RedirectToAction("ViewSelectedCompetencies", new { competencyAssessmentId });
+            }
             else
             {
                 competencyAssessmentService.UpdateFrameworkLinksTaskStatus(model.CompetencyAssessmentId, model.TaskStatus ?? false, null);
@@ -484,7 +489,7 @@ public IActionResult ViewSelectedCompetencies(int competencyAssessmentId)
             var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(competencyAssessmentId);
             if (!linkedFrameworks.Any())
             {
-                return RedirectToAction("AddCompetenciesSelectFramework", new { competencyAssessmentId });
+                return RedirectToAction("SelectFrameworkSources", new { competencyAssessmentId, actionName = "ViewSelected" });
             }
             var adminId = GetAdminID();
             var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId);
@@ -496,7 +501,8 @@ public IActionResult ViewSelectedCompetencies(int competencyAssessmentId)
             return View(model);
         }
         [Route("/Self-Assessment/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
-        public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId)
+        [Route("/Self-Assessment/{competencyAssessmentId}/{actionName}/Competencies/Add/SelectFramework")]
+        public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId, string? actionName)
         {
             var linkedFrameworks = competencyAssessmentService.GetLinkedFrameworksForCompetencyAssessment(competencyAssessmentId);
             if (!linkedFrameworks.Any())
@@ -513,6 +519,7 @@ public IActionResult AddCompetenciesSelectFramework(int competencyAssessmentId)
         }
         [HttpPost]
         [Route("/Self-Assessment/{competencyAssessmentId}/Competencies/Add/SelectFramework")]
+        [Route("/Self-Assessment/{competencyAssessmentId}/{actionName}/Competencies/Add/SelectFramework")]
         public IActionResult AddCompetenciesSelectFramework(AddCompetenciesSelectFrameworkFormData formdata)
         {
             if (!ModelState.IsValid)
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectFrameworkSourcesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectFrameworkSourcesViewModel.cs
index 8d1adea226..45ab4395e2 100644
--- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectFrameworkSourcesViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SelectFrameworkSourcesViewModel.cs
@@ -23,7 +23,7 @@ public SelectFrameworkSourcesViewModel(CompetencyAssessmentBase competencyAssess
             Frameworks = [.. frameworks
                 .Where(f => !excludedIds.Contains(f.ID))
                 .OrderBy(f => f.FrameworkName)];
-            AdditionalFrameworks = [.. additionalFrameworksIds.Select(id => frameworks.First(f => f.ID == id))];
+            AdditionalFrameworks = [.. additionalFrameworksIds.Select(id => frameworks.FirstOrDefault(f => f.ID == id))];
             ActionName = actionName;
         }
         public IEnumerable<BrandedFramework> Frameworks { get; set; }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
index 277228e2f2..d0af8f724a 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
@@ -73,16 +73,19 @@
                 }
             </div>
         }
-        @if (Model.AdditionalFrameworks.Count() > 0)
+        @if (Model?.AdditionalFrameworks != null && Model.AdditionalFrameworks.Any())
         {
-            for (int i = 0; i < Model.AdditionalFrameworks.Count(); i++)
+            int i = 0;
+            foreach (var framework in Model.AdditionalFrameworks)
             {
+                if (framework == null) continue;
+
                 <div class="nhsuk-summary-list__row">
                     <dt class="nhsuk-summary-list__key">
                         Additional framework @(i + 1)
                     </dt>
                     <dd class="nhsuk-summary-list__value">
-                        @Model.AdditionalFrameworks.ElementAt(i).FrameworkName
+                        @framework.FrameworkName
                     </dd>
                     @if (Model.UserRole > 1)
                     {
@@ -90,28 +93,28 @@
                             <ul class="nhsuk-summary-list__actions-list nhsuk-summary-list__actions-list--inline left-align-actions">
                                 <li class="nhsuk-summary-list__actions-list-item">
                                     <a asp-action="RemoveFramework"
-                                       asp-route-frameworkId="@Model.AdditionalFrameworks.ElementAt(i).ID"
+                                       asp-route-frameworkId="@framework.ID"
                                        asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                                        Remove <span class="nhsuk-u-visually-hidden">@Model.AdditionalFrameworks.ElementAt(i).FrameworkName</span>
+                                        Remove <span class="nhsuk-u-visually-hidden">@framework.FrameworkName</span>
                                     </a>
                                 </li>
                                 <li class="nhsuk-summary-list__actions-list-item">
-                                    <a asp-action="ConfirmMaKePrimaryFramework"
-                                       asp-route-frameworkId="@Model.AdditionalFrameworks.ElementAt(i).ID"
+                                    <a asp-action="ConfirmMakePrimaryFramework"
+                                       asp-route-frameworkId="@framework.ID"
                                        asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]">
-                                        Make primary <span class="nhsuk-u-visually-hidden">@Model.AdditionalFrameworks.ElementAt(i).FrameworkName</span>
+                                        Make primary <span class="nhsuk-u-visually-hidden">@framework.FrameworkName</span>
                                     </a>
                                 </li>
-
                             </ul>
                         </dd>
                     }
                 </div>
+                i++;
             }
         }
     </dl>
 }
-@if (Model.ActionName == "AddFramework")
+@if (Model.ActionName == "AddFramework" || Model.ActionName == "ViewSelected")
 {
     <form method="post">
         <div class="nhsuk-form-group">