diff --git a/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/util/AqlHelper.java b/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/util/AqlHelper.java
index d977c7ea5..137cdfb79 100644
--- a/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/util/AqlHelper.java
+++ b/build-info-extractor/src/main/java/org/jfrog/build/extractor/clientConfiguration/util/AqlHelper.java
@@ -62,7 +62,11 @@ public List<AqlSearchResult.SearchEntry> run() throws IOException {
         if (this.filesGroup.getSpecType() == FilesGroup.SpecType.BUILD) {
             artifactsSha1SearchResults = queryResults;
         } else {
-            artifactsSha1SearchResults = fetchBuildArtifactsSha1();
+            if (!StringUtils.isBlank(this.buildName) && !StringUtils.isBlank(this.buildNumber)) {
+                artifactsSha1SearchResults = fetchBuildArtifactsSha1();
+            } else {
+                artifactsSha1SearchResults = new ArrayList<>();
+            }
         }
 
         List<AqlSearchResult.SearchEntry> results = filterResult(queryResults, artifactsSha1SearchResults);