diff --git a/catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java b/catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java
index 515c76248b3..2cafcf7a2c4 100644
--- a/catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java
+++ b/catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/config/ConfigurationApplication.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -392,10 +393,11 @@ private void findDifferences(List<Map<String, Object>> innerList,
     }
 
     private void stopImageryEndpoints(List<String> imageryEndpointsToStop) {
-        for (String endpoint : imageryEndpointsToStop) {
+        for (Iterator<String> iterator = imageryEndpointsToStop.iterator(); iterator.hasNext(); ) {
+            String endpoint = iterator.next();
             try {
                 httpProxy.stop(endpoint);
-                imageryEndpoints.remove(endpoint);
+                iterator.remove();
             } catch (Exception e) {
                 LOGGER.error("Unable to stop proxy endpoint: {}", endpoint, e);
             }