diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index 877a34f0..41fdbb0e 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -779,10 +779,15 @@ let MakeRepresentation = (props) => {
                 props.props.currentView.caseReference.currentReference,
             "pinswg_questionnaireduedate":
                 detailsObj.pinswg_questionnaireduedate,
-            "pinswg_statementduedate": detailsObj.pinswg_statementduedate,
-            "pinswg_statementsduedate": detailsObj.pinswg_statementsduedate,
+            "pinswg_statementduedate":
+                detailsObj.pinswg_statementduedate ||
+                detailsObj.pinswg_endofrepresentationperiod,
+            "pinswg_statementsduedate":
+                detailsObj.pinswg_statementsduedate ||
+                detailsObj.pinswg_endofrepresentationperiod,
             "pinswg_finalcommentsduedate":
-                detailsObj.pinswg_finalcommentsduedate,
+                detailsObj.pinswg_finalcommentsduedate ||
+                detailsObj.pinswg_endofrepresentationperiod,
             "pinswg_name":
                 props.props.currentView.caseReference.currentReference,
             "firstname": props.props.accountDetails.accountDetails.firstname,