diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae3d117b..7ce5d7eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -188,10 +188,6 @@ jobs:
         run: |
           npm install
           npm run build
-
-      - name: Make Config Files
-        run: |
-          cat ./configs/hitideConfig-${{ env.THE_ENV }}.js > ./dist/hitideConfig.js
       
       ## Deployment
       - name: Deploy Env Override
@@ -206,6 +202,10 @@ jobs:
           echo "THE_ENV=${override_env}" >> $GITHUB_ENV
           echo "TARGET_ENV_UPPERCASE=${override_env_upper}" >> $GITHUB_ENV
 
+      - name: Make Config Files
+        run: |
+          cat ./configs/hitideConfig-${{ env.THE_ENV }}.js > ./dist/hitideConfig.js
+
       - name: Configure AWS credentials 
         uses: aws-actions/configure-aws-credentials@v4
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c76ab50..119947d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - issue-48: Fixed collection resolution error handling
 - issue-49: Removed unused Docker and Jenkins folders/files from HiTIDE-UI
 - issue-52: Fixed missing thumbnail placeholder
+- issue-44: Fixed footprints and previews stay on map when not intended
 
 
 ## [4.16.2]
diff --git a/src/jpl/dijit/GranulesController.js b/src/jpl/dijit/GranulesController.js
index 220c9c86..e3bcd8b8 100644
--- a/src/jpl/dijit/GranulesController.js
+++ b/src/jpl/dijit/GranulesController.js
@@ -746,6 +746,7 @@ define([
         postGranulesFetch: function(response) {
             this.availableGranules = response.hits;
             var _context = this;
+
             response.items.map(function(x) {
                 GranuleMetadata.convertFootprintAndImageFromCMR(x);
                 var granule_id = x["meta"]["concept-id"];
@@ -766,6 +767,19 @@ define([
                 _context.gridStore.add(x)
             });
 
+            // remove footprints and preview from displaying on the map if they are not in the current page of the granule table
+            var currentlyVisibleFootprints = {}
+            var currentlyVisiblePreviews = {}
+
+            for (var i=0; i<this.stateStore.data.length; i++) {
+                var currentVisibleGranule = this.stateStore.data[i]
+                if (currentVisibleGranule.footprint) currentlyVisibleFootprints[currentVisibleGranule["Granule-Name"]] = currentVisibleGranule
+                if (currentVisibleGranule.preview) currentlyVisiblePreviews[currentVisibleGranule["Granule-Name"]] = currentVisibleGranule
+            }
+            
+            _context.toggleFootprints(Object.values(currentlyVisibleFootprints), false, true)
+            _context.togglePreviews(Object.values(currentlyVisiblePreviews), false, true)
+
             this.granulesInGrid = this.gridStore.query().length;
 
             // Set no data message accordingly
@@ -857,7 +871,6 @@ define([
             }
             return value.toISOString().slice(0, 16);
         },
-
         updateStateStoreObj: function(obj) {
             // If obj has no active states, remove it else upsert
             if (!obj.footprint && !obj.preview) {
@@ -906,7 +919,9 @@ define([
             }
         },
 
-        toggleFootprints: function(granuleObjs, active) {
+        toggleFootprints: function(granuleObjs, active, inStoreAlready) {
+            // if obj already in grid store, update and don't put
+            inStoreAlready = inStoreAlready || false
             for (var i = 0; i < granuleObjs.length; i++) {
                 // Update store
                 var obj = granuleObjs[i];
@@ -914,7 +929,9 @@ define([
                 if (obj.footprint != active) {
                     if(obj["Granule-Footprint"]){
                         obj.footprint = active;
-                        this.gridStore.put(obj);
+                        if (!inStoreAlready) {
+                            this.gridStore.put(obj);
+                        }
                         this.updateStateStoreObj(obj);
 
                         // Update fp
@@ -925,14 +942,18 @@ define([
             }
         },
 
-        togglePreviews: function(granuleObjs, active) {
+        togglePreviews: function(granuleObjs, active, inStoreAlready) {
+            // if obj already in grid store, update and don't put
+            inStoreAlready = inStoreAlready || false
             for (var i = 0; i < granuleObjs.length; i++) {
                 // Update store
                 var obj = granuleObjs[i];
                 if (obj.preview != active) {
                     if(obj.has_image){
                         obj.preview = active;
-                        this.gridStore.put(obj);
+                        if (!inStoreAlready) {
+                            this.gridStore.put(obj);
+                        }
                         this.updateStateStoreObj(obj);
 
                         // Update preview