diff --git a/x-pack/legacy/plugins/maps/public/angular/map_controller.js b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
index 519ba0b1e3d9..bc97643689e1 100644
--- a/x-pack/legacy/plugins/maps/public/angular/map_controller.js
+++ b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
@@ -310,9 +310,15 @@ app.controller(
       const layerListConfigOnly = copyPersistentState(layerList);
 
       const savedLayerList = savedMap.getLayerList();
-      const oldConfig = savedLayerList ? savedLayerList : initialLayerListConfig;
 
-      return !_.isEqual(layerListConfigOnly, oldConfig);
+      return !savedLayerList
+        ? !_.isEqual(layerListConfigOnly, initialLayerListConfig)
+        : // savedMap stores layerList as a JSON string using JSON.stringify.
+          // JSON.stringify removes undefined properties from objects.
+          // savedMap.getLayerList converts the JSON string back into Javascript array of objects.
+          // Need to perform the same process for layerListConfigOnly to compare apples to apples
+          // and avoid undefined properties in layerListConfigOnly triggering unsaved changes.
+          !_.isEqual(JSON.parse(JSON.stringify(layerListConfigOnly)), savedLayerList);
     }
 
     function isOnMapNow() {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
index c6b68b7e9440..53c218210400 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
@@ -28,12 +28,20 @@ export function DynamicColorForm({
     };
     if (type === COLOR_MAP_TYPE.ORDINAL) {
       newColorOptions.useCustomColorRamp = useCustomColorMap;
-      newColorOptions.customColorRamp = customColorMap;
-      newColorOptions.color = color;
+      if (customColorMap) {
+        newColorOptions.customColorRamp = customColorMap;
+      }
+      if (color) {
+        newColorOptions.color = color;
+      }
     } else {
       newColorOptions.useCustomColorPalette = useCustomColorMap;
-      newColorOptions.customColorPalette = customColorMap;
-      newColorOptions.colorCategory = color;
+      if (customColorMap) {
+        newColorOptions.customColorPalette = customColorMap;
+      }
+      if (color) {
+        newColorOptions.colorCategory = color;
+      }
     }
 
     onDynamicStyleChange(styleProperty.getStyleName(), newColorOptions);