diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
index 03ed1e73d8..6e156a62ce 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
@@ -78,7 +78,7 @@ public class PuzzleSolver implements Runnable
 
 	public boolean hasExceededWaitDuration()
 	{
-		return stopwatch.elapsed().compareTo(MAX_WAIT_DURATION) > 0;
+		return stopwatch != null && stopwatch.elapsed().compareTo(MAX_WAIT_DURATION) > 0;
 	}
 
 	public boolean hasFailed()