diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index 163d5016..e551bf4c 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -1216,6 +1216,10 @@ public class PKListener implements Listener {
 			GeneralMethods.removeUnusableAbilities(player.getName());
 		}, 5);
 
+		// TFM Start - make players invincible by default
+		Commands.invincible.add(player.getName());
+		// TFM End
+
 		if (ConfigManager.languageConfig.get().getBoolean("Chat.Branding.JoinMessage.Enabled")) {
 			Bukkit.getScheduler().runTaskLater(ProjectKorra.plugin, (Runnable) () -> {
 				ChatColor color = ChatColor.valueOf(ConfigManager.languageConfig.get().getString("Chat.Branding.Color").toUpperCase());
@@ -1230,12 +1234,6 @@ public class PKListener implements Listener {
 					player.sendMessage(ChatColor.translateAlternateColorCodes('&', bottomBorder));
 				}
 			}, 20 * 4);
-
-			// TFM Start - make players invincible by default
-			if (!Commands.invincible.contains(player.getName())) {
-				Commands.invincible.add(player.getName());
-			}
-			// TFM End
 		}
 	}