diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java
index c57f432c7..168a8c860 100644
--- a/src/main/java/appeng/client/me/ItemRepo.java
+++ b/src/main/java/appeng/client/me/ItemRepo.java
@@ -227,8 +227,10 @@ public class ItemRepo {
     }
 
     public void clear() {
-        searchTask.cancel(true);
-        searchTask = null;
+        if (searchTask != null) {
+            searchTask.cancel(true);
+            searchTask = null;
+        }
         this.list.resetStatus();
     }