diff --git a/src/components/CountyMap/index.tsx b/src/components/CountyMap/index.tsx
index 7f449287..4896eb1b 100644
--- a/src/components/CountyMap/index.tsx
+++ b/src/components/CountyMap/index.tsx
@@ -29,7 +29,7 @@ export interface CountyMapProps {
   data: Array<IMapDataProps>;
   geoJSONPath: string;
   mapboxAccessToken: string;
-  mapPopupProps?: Omit<MapPopupProps, 'popupProps'>;
+  mapPopupProps?: Partial<MapPopupProps>;
   mapProps?: Omit<Partial<MapProps>, 'mapboxAccessToken'>;
   onHoverInfo?: FeatureHoverProps;
   processDataFn?: (
diff --git a/src/components/GeomarketMap/index.tsx b/src/components/GeomarketMap/index.tsx
index 287c2c57..3ab93b4b 100644
--- a/src/components/GeomarketMap/index.tsx
+++ b/src/components/GeomarketMap/index.tsx
@@ -27,7 +27,7 @@ export interface GeomarketMapProps {
   data: Array<IMapDataProps>;
   geoJSONPath: string;
   mapboxAccessToken: string;
-  mapPopupProps?: Omit<MapPopupProps, 'popupProps'>;
+  mapPopupProps?: Partial<MapPopupProps>;
   mapProps?: Omit<Partial<MapProps>, 'mapboxAccessToken'>;
   onHoverInfo?: FeatureHoverProps;
   processDataFn?: (
diff --git a/src/components/HeatMap/index.tsx b/src/components/HeatMap/index.tsx
index 74a0c1e2..537c888c 100644
--- a/src/components/HeatMap/index.tsx
+++ b/src/components/HeatMap/index.tsx
@@ -30,7 +30,7 @@ export interface HeatMapProps {
   color?: string;
   data?: GeoJSON.FeatureCollection<GeoJSON.Geometry>;
   mapboxAccessToken: string;
-  mapPopupProps?: Omit<MapPopupProps, 'popupProps'>;
+  mapPopupProps?: Partial<MapPopupProps>;
   mapProps?: Omit<Partial<MapProps>, 'mapboxAccessToken'>;
   onHoverInfo?: FeatureHoverProps;
   setOnHoverInfo?: (newHoverInfo: FeatureHoverProps | undefined) => void;
diff --git a/src/components/SCFMap/index.tsx b/src/components/SCFMap/index.tsx
index 5f1f7d19..881c3147 100644
--- a/src/components/SCFMap/index.tsx
+++ b/src/components/SCFMap/index.tsx
@@ -29,7 +29,7 @@ export interface SCFMapProps {
   data: Array<IMapDataProps>;
   geoJSONPath: string;
   mapboxAccessToken: string;
-  mapPopupProps?: Omit<MapPopupProps, 'popupProps'>;
+  mapPopupProps?: Partial<MapPopupProps>;
   mapProps?: Omit<Partial<MapProps>, 'mapboxAccessToken'>;
   onHoverInfo?: FeatureHoverProps;
   processDataFn?: (
diff --git a/src/components/StateMap/index.tsx b/src/components/StateMap/index.tsx
index 65292e03..f8bb9fee 100644
--- a/src/components/StateMap/index.tsx
+++ b/src/components/StateMap/index.tsx
@@ -27,7 +27,7 @@ export interface StateMapProps {
   data: Array<IMapDataProps>;
   geoJSONPath: string;
   mapboxAccessToken: string;
-  mapPopupProps?: Omit<MapPopupProps, 'popupProps'>;
+  mapPopupProps?: Partial<MapPopupProps>;
   mapProps?: Omit<Partial<MapProps>, 'mapboxAccessToken'>;
   onHoverInfo?: FeatureHoverProps;
   processDataFn?: (