diff --git a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java
index 37e645069..3dad81d77 100644
--- a/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java
+++ b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/MiniMessageUtil.java
@@ -67,6 +67,6 @@ public static String legacyToMiniMessage(String message) {
             TextComponent deserialize = LegacyComponentSerializer.legacySection().deserialize(message);
             return MiniMessage.miniMessage().serialize(deserialize);
         }
-        return null;
+        return message;
     }
 }
diff --git a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java
index 86c103bd5..57956eb39 100644
--- a/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java
+++ b/worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/ComponentFlagMigration.java
@@ -85,7 +85,7 @@ protected void migrate(RegionDatabase store) throws MigrationException {
                 String val = region.getFlag(replaceFlag);
                 if (val != null) {
                     String migration = migrateToMinimessage(val);
-                    if (migration != null) {
+                    if (!val.equals(migration)) {
                         region.setFlag(replaceFlag, migration);
                         changed++;
                     }