diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index a053602..ca8f9b2 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -142,6 +142,8 @@ function SelectMapModal({
   async function handleMapRemove(id) {
     await removeMap(id);
     setSelectedMapId(null);
+    setMapSettingChanges({});
+    setMapStateSettingChanges({});
     // Removed the map from the map screen if needed
     if (currentMap && currentMap.id === selectedMapId) {
       onMapChange(null, null);
diff --git a/src/modals/SelectTokensModal.js b/src/modals/SelectTokensModal.js
index 01c87f1..d6b3f14 100644
--- a/src/modals/SelectTokensModal.js
+++ b/src/modals/SelectTokensModal.js
@@ -96,6 +96,7 @@ function SelectTokensModal({ isOpen, onRequestClose }) {
   async function handleTokenRemove(id) {
     await removeToken(id);
     setSelectedTokenId(null);
+    setTokenSettingChanges({});
   }
 
   /**