diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
index 6c1d6a5b..12ea81d8 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
@@ -67,16 +67,19 @@ public abstract class MindmapFilter {
 
     static public MindmapFilter parse(@Nullable final String valueStr) {
         MindmapFilter result = null;
-        for (MindmapFilter value : MindmapFilter.values) {
-            if (value.id.equals(valueStr)) {
-                result = value;
-                break;
+        if (valueStr != null) {
+            for (MindmapFilter value : MindmapFilter.values) {
+                if (value.id.equals(valueStr)) {
+                    result = value;
+                    break;
+                }
             }
-        }
-        // valueStr is not a default filter
-        if (result == null) {
-            assert valueStr != null;
-            result = new LabelFilter(valueStr);
+            // valueStr is not a default filter
+            if (result == null) {
+                result = new LabelFilter(valueStr);
+            }
+        } else {
+            result = ALL;
         }
         return result;
     }