diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
index bdd4814220..4ccbc18ee8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
@@ -325,12 +325,9 @@ public class RaidsOverlay extends Overlay
 
 					String bossName = room.getBoss().getName();
 					String bossNameLC = bossName.toLowerCase();
-					if (plugin.isShowRecommendedItems())
+					if (plugin.isShowRecommendedItems() && plugin.getRecommendedItemsList().get(bossNameLC) != null)
 					{
-						if (plugin.getRecommendedItemsList().get(bossNameLC) != null)
-						{
-							imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC));
-						}
+						imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC));
 					}
 
 					tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
index d0de393b47..ee8574f198 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
@@ -1218,12 +1218,10 @@ public class RaidsPlugin extends Plugin
 	{
 		if (raid.getRotationString().toLowerCase().equals("vasa,tekton,vespula")
 			&& raid.getFullRotationString().toLowerCase().contains("crabs")
-			&& raid.getFullRotationString().toLowerCase().contains("tightrope"))
+			&& raid.getFullRotationString().toLowerCase().contains("tightrope")
+			&& goodCrabs != null)
 		{
-			if (goodCrabs != null)
-			{
-				return goodCrabs;
-			}
+			return goodCrabs;
 		}
 		return null;
 	}