diff --git a/docker/docmosis/templates/CV-UNS-HNO-ENG-01196.docx b/docker/docmosis/templates/CV-UNS-HNO-ENG-01196.docx
index 5653fd8cecd..be705500ed4 100644
Binary files a/docker/docmosis/templates/CV-UNS-HNO-ENG-01196.docx and b/docker/docmosis/templates/CV-UNS-HNO-ENG-01196.docx differ
diff --git a/docker/docmosis/templates/CV-UNS-HNO-ENG-01197.docx b/docker/docmosis/templates/CV-UNS-HNO-ENG-01197.docx
index 0199cf37ecc..ac8be099ede 100644
Binary files a/docker/docmosis/templates/CV-UNS-HNO-ENG-01197.docx and b/docker/docmosis/templates/CV-UNS-HNO-ENG-01197.docx differ
diff --git a/docker/docmosis/templates/CV-UNS-HNO-ENG-01198.docx b/docker/docmosis/templates/CV-UNS-HNO-ENG-01198.docx
index c04509eb39b..3bda9409259 100644
Binary files a/docker/docmosis/templates/CV-UNS-HNO-ENG-01198.docx and b/docker/docmosis/templates/CV-UNS-HNO-ENG-01198.docx differ
diff --git a/src/main/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtils.java b/src/main/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtils.java
index 3b902f3d10b..5ca09370140 100644
--- a/src/main/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtils.java
+++ b/src/main/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtils.java
@@ -22,7 +22,7 @@ private HearingFeeUtils() {
     public static LocalDate calculateHearingDueDate(LocalDate now, LocalDate hearingDate) {
         LocalDate calculatedHearingDueDate;
         if (now.isBefore(hearingDate.minusDays(36))) {
-            calculatedHearingDueDate = now.plusDays(28);
+            calculatedHearingDueDate = hearingDate.minusDays(28);
         } else {
             calculatedHearingDueDate = now.plusDays(7);
         }
diff --git a/src/test/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtilsTest.java b/src/test/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtilsTest.java
index d2143739321..d3e292534a0 100644
--- a/src/test/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtilsTest.java
+++ b/src/test/java/uk/gov/hmcts/reform/civil/utils/HearingFeeUtilsTest.java
@@ -35,7 +35,7 @@ class HearingFeeUtilsTest {
     @CsvSource({
         // current date,hearing date,expected
         "2022-10-27,2022-11-04,2022-11-03",   // based on bug report: on the boundary of exactly 7 days
-        "2022-10-01,2022-11-14,2022-10-29",   // hearing date more than 36 days away -> expect in 28 straight days time
+        "2022-10-01,2022-11-14,2022-10-17",   // hearing date more than 36 days away -> expect in 28 straight days time
         "2022-10-01,2022-10-14,2022-10-08",   // hearing date less than 36 days away -> expect in 7 straight days
         "2022-10-01,2022-10-10,2022-10-08"    // should never happen. If it does the deadline is the hearing day
     })