diff --git a/app/reporting-framework/json-reports/clinical-reminder-report.json b/app/reporting-framework/json-reports/clinical-reminder-report.json
index 4af7a002a..c5e0f3be0 100644
--- a/app/reporting-framework/json-reports/clinical-reminder-report.json
+++ b/app/reporting-framework/json-reports/clinical-reminder-report.json
@@ -222,7 +222,7 @@
     {
       "type": "simple_column",
       "alias": "last_encounter_date",
-      "column": "ls.encounter_datetime"
+      "column": "t1.encounter_datetime"
     },
     {
       "type": "simple_column",
diff --git a/service/patient-reminder.service.js b/service/patient-reminder.service.js
index 37cac3049..74498f2b2 100755
--- a/service/patient-reminder.service.js
+++ b/service/patient-reminder.service.js
@@ -945,7 +945,10 @@ function getFPExpiryDate(data) {
 function generateAppointmentNoShowUpRiskReminder(data) {
   let reminders = [];
   const predicted_score = (data.predicted_prob_disengage * 100).toFixed(2);
-  if (data.predicted_risk) {
+  if (
+    data.predicted_risk &&
+    data.last_encounter_date < data.prediction_generated_date
+  ) {
     if (data.predicted_risk === 'Medium Risk') {
       reminders.push({
         message: