diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
index 5243bf300bff8d03d6f38bf3cc25e798f9c1bc4a..cf4ab4412b2665cc38ab675225148f3d9d115b44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
@@ -90,6 +90,10 @@ public class QueryViewer extends ContentPanel implements IDatabaseModificationOb
         Long queryIdOrNull = queryProvider.tryGetQueryId();
         String sqlQueryOrNull = queryProvider.tryGetSQLQuery();
         QueryParameterBindings bindingsOrNull = queryProvider.tryGetQueryParameterBindings();
+        if (queryIdOrNull == null && sqlQueryOrNull == null)
+        {
+            return;
+        }
         ReportGeneratedCallback callback =
                 new ReportGeneratedCallback(viewContext.getCommonViewContext(),
                         createReportInformationProvider(sqlQueryOrNull),