diff --git a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java
index c02d85c955..ffe8fd24d7 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java
@@ -134,7 +134,7 @@ public class ClanManager
 
 	private void onGameStateChanged(GameStateChanged gameStateChanged)
 	{
-		if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN && offset == 0)
+		if (gameStateChanged.getGameState() == GameState.LOGGED_IN && offset == 0)
 		{
 			loadClanChatIcons();
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/sounds/SoundsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/sounds/SoundsPlugin.java
index 248d6a056e..8040cccc27 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/sounds/SoundsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/sounds/SoundsPlugin.java
@@ -65,13 +65,16 @@ public class SoundsPlugin extends Plugin
 	{
 		if (event.getNpcid() != -1)
 		{
-			if (ArrayUtils.contains(sounds.get(event.getNpcid()), event.getSoundId()))
+			if (sounds != null)
 			{
-				return;
+				if (ArrayUtils.contains(sounds.get(event.getNpcid()), event.getSoundId()))
+				{
+					return;
+				}
+				int[] newSounds = ArrayUtils.add(sounds.get(event.getNpcid()), event.getSoundId());
+				sounds.put(event.getNpcid(), newSounds);
+				soundsClient.submit(event.getNpcid(), event.getSoundId());
 			}
-			int[] newSounds = ArrayUtils.add(sounds.get(event.getNpcid()), event.getSoundId());
-			sounds.put(event.getNpcid(), newSounds);
-			soundsClient.submit(event.getNpcid(), event.getSoundId());
 		}
 	}
 }