diff --git a/grid/impl/src/dump/DumpHandler.java b/grid/impl/src/dump/DumpHandler.java
index cf3a1bd83fec..d74ed9072307 100644
--- a/grid/impl/src/dump/DumpHandler.java
+++ b/grid/impl/src/dump/DumpHandler.java
@@ -121,9 +121,12 @@ public abstract class DumpHandler<T> {
         int resultSetIndex = getResultSetIndex(s);
         ModelIndexSet<GridColumn> selectedColumns = getSelectedColumns(s);
         String queryText = myNameProvider.getQueryText(s);
+        if (queryText == null) { // I see no reason to just ignore extractions with a null query if we allow empty string queries
+          queryText = "";
+        }
         String name = myNameProvider.getName(s);
         DataExtractor extractor = factory.createExtractor(createExtractorConfig(s, project));
-        return extractor != null && queryText != null ?
+        return extractor != null ?
                new Triple<>((T)s, extractor, new DumpHandlerParameters(selectedColumns, queryText, subQueryIndex, resultSetIndex, name)) :
                null;
       })