diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
index 3e8b9181a..bfa0eb426 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
@@ -205,10 +205,6 @@ public class FlagManager {
         if (!result) {
             return false;
         }
-        final Flag hasFlag = getPlotFlag(plot, flag.getKey());
-        if (hasFlag != null) {
-            plot.settings.flags.remove(hasFlag);
-        }
         plot.settings.flags.put(flag.getKey(), flag);
         DBFunc.setFlags(plot.world, plot, plot.settings.flags.values());
         return true;
@@ -247,7 +243,7 @@ public class FlagManager {
             map = new HashMap<>();
         }
         else {
-            map = plotworld.DEFAULT_FLAGS;
+            map = (HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone();
         }
         map.putAll(settings.flags);
         return map.values();