diff --git a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
index 06f18ba6c87..526865f4704 100644
--- a/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
+++ b/web-services/query/src/main/java/datawave/webservice/query/util/LookupUUIDUtil.java
@@ -421,10 +421,12 @@ public <T> T createUUIDQueryAndNext(final AbstractUUIDLookupCriteria unvalidated
     
     private Query createSettings(MultivaluedMap<String,String> queryParameters) {
         Query query = responseObjectFactory.getQueryImpl();
-        query.setOptionalQueryParameters(queryParameters);
-        for (String key : queryParameters.keySet()) {
-            if (queryParameters.get(key).size() == 1) {
-                query.addParameter(key, queryParameters.get(key).get(0));
+        if (queryParameters != null) {
+            query.setOptionalQueryParameters(queryParameters);
+            for (String key : queryParameters.keySet()) {
+                if (queryParameters.get(key).size() == 1) {
+                    query.addParameter(key, queryParameters.get(key).get(0));
+                }
             }
         }
         return query;