diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
index 5216d24ace..ae5ce3e111 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
@@ -438,7 +438,7 @@ public class BankedCalculator extends JPanel
 	{
 		// This is triggered on every click so don't update if activity didn't actually change
 		Activity cur = activityMap.get(i);
-		if (cur == a)
+		if (cur != null && cur.equals(a))
 		{
 			return;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
index ca0c650c0f..de8b340c08 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
@@ -270,7 +270,7 @@ class SkillCalculator extends JPanel
 
 				for (JCheckBox checkBox : uiCheckBoxList)
 				{
-					if (checkBox != uiCheckBox)
+					if (checkBox != null && !checkBox.equals(uiCheckBox))
 					{
 						checkBox.setSelected(false);
 					}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
index c337470c32..bef7020240 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
@@ -123,7 +123,7 @@ class SkillCalculatorPanel extends PluginPanel
 			MaterialTab tab = new MaterialTab(icon, skillGroup, null);
 			tab.setOnSelectEvent(() ->
 			{
-				if (currentCalc == calculatorType)
+				if (currentCalc != null && currentCalc.equals(calculatorType))
 				{
 					return true;
 				}