diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
index 13dc6d4ae6..82a93cb99f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/AttackIndicatorPlugin.java
@@ -38,12 +38,14 @@ import java.util.Set;
 import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
+import net.runelite.api.GameState;
 import net.runelite.api.Skill;
 import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.events.ConfigChanged;
+import net.runelite.client.events.GameStateChanged;
 import net.runelite.client.events.VarbitChanged;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -100,16 +102,6 @@ public class AttackIndicatorPlugin extends Plugin
 		return warnedSkillSelected;
 	}
 
-	@Override
-	protected void startUp() throws Exception
-	{
-		updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
-		updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
-		updateWarnedSkills(config.warnForDefensive(), Skill.DEFENCE);
-		updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
-		updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
-	}
-
 	@Schedule(
 		period = 600,
 		unit = ChronoUnit.MILLIS
@@ -132,6 +124,19 @@ public class AttackIndicatorPlugin extends Plugin
 		}
 	}
 
+	@Subscribe
+	public void onGameStateChange(GameStateChanged event)
+	{
+		if (event.getGameState() == GameState.LOGGED_IN)
+		{
+			updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
+			updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
+			updateWarnedSkills(config.warnForDefensive(), Skill.DEFENCE);
+			updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
+			updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
+		}
+	}
+
 	@Subscribe
 	public void onAttackStyleChange(VarbitChanged event)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java
index 7ecf64cb3b..b6975b0dff 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackindicator/WeaponType.java
@@ -50,7 +50,7 @@ public enum WeaponType
 	TYPE_17(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE),
 	TYPE_18(ACCURATE, AGGRESSIVE, null, DEFENSIVE, CASTING),
 	TYPE_19(RANGING, RANGING, null, LONGRANGE),
-	TYPE_20(ACCURATE, CONTROLLED, null, LONGRANGE),
+	TYPE_20(ACCURATE, CONTROLLED, null, DEFENSIVE),
 	TYPE_21(ACCURATE, AGGRESSIVE, null, DEFENSIVE),
 	TYPE_22(ACCURATE, AGGRESSIVE, AGGRESSIVE, DEFENSIVE),
 	TYPE_23(CASTING, CASTING, null, DEFENSIVE_CASTING),