diff --git a/services/app-api/forms/mcpar.json b/services/app-api/forms/mcpar.json
index dea7e0964..caf4fb8bb 100644
--- a/services/app-api/forms/mcpar.json
+++ b/services/app-api/forms/mcpar.json
@@ -2625,6 +2625,7 @@
             "dashboardTitle": "Quality & performance measure total count:",
             "countEntitiesInTitle": true,
             "addEntityButtonText": "Add quality & performance measure",
+            "missingReportingPeriodMessage": "Add the Measure Reporting Period for this quality and performance measure by editing the measure.",
             "editEntityButtonText": "Edit measure",
             "addEditModalAddTitle": "Add a quality & performance measure",
             "addEditModalEditTitle": "Edit quality & performance measure",
diff --git a/services/app-api/utils/testing/mocks/mockForm.ts b/services/app-api/utils/testing/mocks/mockForm.ts
index 4651adb49..30038bfe4 100644
--- a/services/app-api/utils/testing/mocks/mockForm.ts
+++ b/services/app-api/utils/testing/mocks/mockForm.ts
@@ -216,6 +216,7 @@ export const mockModalDrawerReportPageVerbiage = {
   intro: mockVerbiageIntro,
   dashboardTitle: "Mock dashboard title",
   addEntityButtonText: "Mock add entity button text",
+  missingReportingPeriodMessage: "Mock measure unfinished message",
   editEntityButtonText: "Mock edit entity button text",
   addEditModalAddTitle: "Mock add/edit entity modal add title",
   addEditModalEditTitle: "Mock add/edit entity modal edit title",
diff --git a/services/app-api/utils/types/reports.ts b/services/app-api/utils/types/reports.ts
index c097d81c8..64985a4cb 100644
--- a/services/app-api/utils/types/reports.ts
+++ b/services/app-api/utils/types/reports.ts
@@ -94,6 +94,7 @@ export interface DrawerReportPageVerbiage extends ReportPageVerbiage {
 export interface ModalDrawerReportPageVerbiage
   extends DrawerReportPageVerbiage {
   addEntityButtonText: string;
+  missingReportingPeriodMessage: string;
   editEntityButtonText: string;
   addEditModalAddTitle: string;
   addEditModalEditTitle: string;
diff --git a/services/ui-src/src/components/cards/EntityCard/EntityCard.tsx b/services/ui-src/src/components/cards/EntityCard/EntityCard.tsx
index cdee8b46a..e407268a3 100644
--- a/services/ui-src/src/components/cards/EntityCard/EntityCard.tsx
+++ b/services/ui-src/src/components/cards/EntityCard/EntityCard.tsx
@@ -114,15 +114,23 @@ export const EntityCard = ({
           printVersion={!!printVersion}
         />
         {openAddEditEntityModal && (
-          <Button
-            variant="outline"
-            size="sm"
-            sx={sx.editButton}
-            leftIcon={<Image src={editIcon} alt="edit icon" height="1rem" />}
-            onClick={() => openAddEditEntityModal(entity)}
-          >
-            {verbiage.editEntityButtonText}
-          </Button>
+          <>
+            {entityType == ModalDrawerEntityTypes.QUALITY_MEASURES &&
+              !formattedEntityData.reportingPeriod && (
+                <Text sx={sx.missingReportingPeriodMessage}>
+                  {verbiage.missingReportingPeriodMessage}
+                </Text>
+              )}
+            <Button
+              variant="outline"
+              size="sm"
+              sx={sx.editButton}
+              leftIcon={<Image src={editIcon} alt="edit icon" height="1rem" />}
+              onClick={() => openAddEditEntityModal(entity)}
+            >
+              {verbiage.editEntityButtonText}
+            </Button>
+          </>
         )}
         {entityStarted || entityCompleted || printVersion ? (
           <EntityCardBottomSection
@@ -239,6 +247,11 @@ const sx = {
       filter: svgFilters.primary_darker,
     },
   },
+  missingReportingPeriodMessage: {
+    marginTop: "1rem",
+    fontSize: "xs",
+    color: "palette.error_dark",
+  },
   unfinishedMessage: {
     fontSize: "xs",
     color: "palette.error_dark",
diff --git a/services/ui-src/src/components/cards/EntityCard/EntityCardTopSection.tsx b/services/ui-src/src/components/cards/EntityCard/EntityCardTopSection.tsx
index 518006a75..911e6ee9f 100644
--- a/services/ui-src/src/components/cards/EntityCard/EntityCardTopSection.tsx
+++ b/services/ui-src/src/components/cards/EntityCard/EntityCardTopSection.tsx
@@ -104,7 +104,18 @@ export const EntityCardTopSection = ({
                   ? "D2.VII.7a Reporting Period and D2.VII.7b Reporting period: Date range"
                   : "Measure Reporting Period"}
               </Text>
-              <Text sx={sx.subtext}>{formattedEntityData.reportingPeriod}</Text>
+              {formattedEntityData.reportingPeriod ? (
+                <Text sx={sx.subtext}>
+                  {formattedEntityData.reportingPeriod}
+                </Text>
+              ) : (
+                <Text
+                  sx={sx.unfinishedMessage}
+                  className={printVersion ? "pdf-color" : ""}
+                >
+                  Not answered
+                </Text>
+              )}
             </GridItem>
           </Grid>
           <Text sx={sx.subtitle}>
@@ -145,4 +156,11 @@ const sx = {
     marginTop: "0.25rem",
     fontSize: "sm",
   },
+  unfinishedMessage: {
+    fontSize: "xs",
+    color: "palette.error_dark",
+    "&.pdf-color": {
+      color: "palette.error_darker",
+    },
+  },
 };
diff --git a/services/ui-src/src/types/reports.ts b/services/ui-src/src/types/reports.ts
index fc0adba6f..b7c62f336 100644
--- a/services/ui-src/src/types/reports.ts
+++ b/services/ui-src/src/types/reports.ts
@@ -126,6 +126,7 @@ export interface DrawerReportPageVerbiage extends ReportPageVerbiage {
 export interface ModalDrawerReportPageVerbiage
   extends DrawerReportPageVerbiage {
   addEntityButtonText: string;
+  missingReportingPeriodMessage: string;
   editEntityButtonText: string;
   addEditModalAddTitle: string;
   addEditModalEditTitle: string;
diff --git a/services/ui-src/src/utils/testing/mockForm.tsx b/services/ui-src/src/utils/testing/mockForm.tsx
index f7da10728..aa8377343 100644
--- a/services/ui-src/src/utils/testing/mockForm.tsx
+++ b/services/ui-src/src/utils/testing/mockForm.tsx
@@ -237,6 +237,7 @@ export const mockNestedReportPageJson = {
 export const mockModalDrawerReportPageVerbiage = {
   intro: mockVerbiageIntro,
   dashboardTitle: "Mock dashboard title",
+  missingReportingPeriodMessage: "Mock measure unfinished message",
   addEntityButtonText: "Mock add entity button text",
   editEntityButtonText: "Mock edit entity button text",
   addEditModalAddTitle: "Mock add/edit entity modal add title",