diff --git a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java
index 77eb12080b3..5b5c6e6f995 100644
--- a/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java
+++ b/src/main/java/uk/gov/hmcts/reform/prl/services/ManageOrderService.java
@@ -3291,13 +3291,10 @@ public HearingData getHearingData(String authorization,
         return hearingDataService.generateHearingData(hearingDataPrePopulatedDynamicLists, caseData);
     }
 
-
-
     private void addC21OrderDetails(CaseData caseData,
                                     Map<String, Object> caseDataUpdated) {
-        caseDataUpdated.put("selectedC21Order", (null != caseData.getManageOrders()
-            && caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder)
-            ? BOLD_BEGIN + caseData.getCreateSelectOrderOptions().getDisplayedValue() + BOLD_END : " ");
+
+        caseDataUpdated.put("selectedC21Order", getSelectedC21OrderDisplayName(caseData));
 
         C21OrderOptionsEnum c21OrderType = (null != caseData.getManageOrders())
             ? caseData.getManageOrders().getC21OrderOptions() : null;
@@ -3305,6 +3302,20 @@ private void addC21OrderDetails(CaseData caseData,
         caseDataUpdated.put("typeOfC21Order", c21OrderType != null ? BOLD_BEGIN + c21OrderType.getDisplayedValue() + BOLD_END : "");
     }
 
+    private String getSelectedC21OrderDisplayName(CaseData caseData) {
+        String emptyString = "";
+        if (null == caseData.getManageOrders()) {
+            return emptyString;
+        }
+        if (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.createAnOrder) {
+            return BOLD_BEGIN + caseData.getCreateSelectOrderOptions().getDisplayedValue() + BOLD_END;
+        }
+        if (caseData.getManageOrdersOptions() == ManageOrdersOptionsEnum.uploadAnOrder) {
+            return BOLD_BEGIN + caseData.getChildArrangementOrders().getDisplayedValue() + BOLD_END;
+        }
+        return emptyString;
+    }
+
     private void updateCourtName(CallbackRequest callbackRequest,
                                  Map<String, Object> caseDataUpdated) {
         if (callbackRequest.getCaseDetailsBefore() != null