diff --git a/lib/query.js b/lib/query.js
index 326455ff2..bfb9acf57 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -62,7 +62,10 @@ async function run() {
             const dbZip = await getDatabase(repo, language);
             console.log("Running query");
             const runQueryResult = await (0, codeql_1.runQuery)(codeql, dbZip, repo.nwo, queryPack);
-            await uploadRepoResult(controllerRepoId, variantAnalysisId, repo, runQueryResult);
+            if (runQueryResult.resultCount > 0) {
+                // Only upload results if there are any.
+                await uploadRepoResult(controllerRepoId, variantAnalysisId, repo, runQueryResult);
+            }
             await (0, gh_api_client_1.setVariantAnalysisRepoSucceeded)(controllerRepoId, variantAnalysisId, repo.id, runQueryResult.sourceLocationPrefix, runQueryResult.resultCount, runQueryResult.databaseSHA || "HEAD");
         }
         catch (error) {
diff --git a/lib/query.js.map b/lib/query.js.map
index 13f7eaf00..6dea6f31a 100644
--- a/lib/query.js.map
+++ b/lib/query.js.map
@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,qCAAqC;AAErC,wCAA+D;AAC/D,oDAA4D;AAC5D,kDAA0B;AAE1B,iDAAgD;AAChD,qCAAsE;AACtE,yCAAsC;AACtC,mDAKyB;AACzB,qCAKkB;AAElB,KAAK,UAAU,GAAG;IAChB,MAAM,gBAAgB,GAAG,IAAA,4BAAmB,GAAE,CAAC;IAC/C,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAW,IAAA,iBAAQ,GAAE,CAAC;IACjC,MAAM,MAAM,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,iBAAiB,GAAG,IAAA,6BAAoB,GAAE,CAAC;IAEjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAA,gBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC7B;QACD,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAA,gBAAS,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrB;KACF;IAED,MAAM,MAAM,GAAG,IAAA,aAAG,GAAE,CAAC;IAErB,IAAI,SAAiB,CAAC;IACtB,IAAI;QACF,uCAAuC;QACvC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,MAAM,gBAAgB,GAAG,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;QAC3E,SAAS,GAAG,MAAM,IAAA,uBAAU,EAAC,gBAAgB,CAAC,CAAC;KAChD;IAAC,OAAO,KAAc,EAAE;QACvB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;QACzE,IAAI,KAAK,YAAY,sBAAS,IAAI,KAAK,CAAC,cAAc,KAAK,GAAG,EAAE;YAC9D,IAAA,gBAAS,EACP,GAAG,YAAY,2FAA2F,CAC3G,CAAC;SACH;aAAM;YACL,IAAA,gBAAS,EAAC,YAAY,CAAC,CAAC;SACzB;QACD,oCAAoC;QACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,MAAM,IAAA,wCAAwB,EAC5B,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,CAAC,EAAE,EACP,YAAY,CACb,CAAC;SACH;QACD,OAAO;KACR;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,oFAAoF;QACpF,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAChD,sFAAsF;QACtF,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;QAEf,IAAI;YACF,MAAM,IAAA,gDAAgC,EACpC,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,CAAC,EAAE,CACR,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEhD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC7B,MAAM,cAAc,GAAG,MAAM,IAAA,iBAAQ,EAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAE1E,IAAI,cAAc,CAAC,WAAW,GAAG,CAAC,EAAE;gBAClC,wCAAwC;gBACxC,MAAM,gBAAgB,CACpB,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,EACJ,cAAc,CACf,CAAC;aACH;YAED,MAAM,IAAA,+CAA+B,EACnC,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,CAAC,EAAE,EACP,cAAc,CAAC,oBAAoB,EACnC,cAAc,CAAC,WAAW,EAC1B,cAAc,CAAC,WAAW,IAAI,MAAM,CACrC,CAAC;SACH;QAAC,OAAO,KAAc,EAAE;YACvB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;YACzE,IAAI,KAAK,YAAY,sBAAS,IAAI,KAAK,CAAC,cAAc,KAAK,GAAG,EAAE;gBAC9D,IAAA,gBAAS,EACP,GAAG,YAAY,gGAAgG,CAChH,CAAC;aACH;iBAAM;gBACL,IAAA,gBAAS,EAAC,YAAY,CAAC,CAAC;aACzB;YAED,MAAM,IAAA,wCAAwB,EAC5B,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,CAAC,EAAE,EACP,YAAY,CACb,CAAC;SACH;QACD,iFAAiF;QACjF,IAAA,eAAK,EAAC,MAAM,CAAC,CAAC;QACd,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,gBAAwB,EACxB,iBAAyB,EACzB,IAAU,EACV,cAA8B;IAE9B,MAAM,gBAAgB,GAAG,MAAM,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAE5E,iCAAiC;IACjC,MAAM,MAAM,GAAG,MAAM,IAAA,wCAAwB,EAC3C,gBAAgB,EAChB,iBAAiB,EACjB,IAAI,CAAC,EAAE,EACP,gBAAgB,CAAC,MAAM,CACxB,CAAC;IAEF,uDAAuD;IACvD,MAAM,IAAA,6BAAc,EAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACjD,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,cAA8B;IAE9B,MAAM,GAAG,GAAG,IAAI,eAAK,EAAE,CAAC;IAExB,IAAI,cAAc,CAAC,aAAa,EAAE;QAChC,MAAM,iBAAiB,GAAG,YAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC5E,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;KAC9C;SAAM;QACL,MAAM,gBAAgB,GAAG,YAAE,CAAC,gBAAgB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAC1E,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;KAC5C;IAED,OAAO,MAAM,GAAG,CAAC,aAAa,CAAC;QAC7B,WAAW,EAAE,SAAS;QACtB,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAU,EAAE,QAAgB;IACrD,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAChC,IAAI,IAAI,CAAC,WAAW,EAAE;QACpB,uDAAuD;QACvD,OAAO,MAAM,IAAA,mBAAQ,EAAC,IAAI,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;KAC3D;SAAM;QACL,0DAA0D;QAC1D,OAAO,MAAM,IAAA,yBAAgB,EAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;KACtE;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,MAAc,EAAE,IAAU;IACnD,MAAM,OAAO,GAAG,YAAE,CAAC,WAAW,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,GAAG,EAAE,CAAC"}
\ No newline at end of file
diff --git a/src/query.ts b/src/query.ts
index 353ce5b96..c957328e8 100644
--- a/src/query.ts
+++ b/src/query.ts
@@ -87,12 +87,16 @@ async function run(): Promise<void> {
       console.log("Running query");
       const runQueryResult = await runQuery(codeql, dbZip, repo.nwo, queryPack);
 
-      await uploadRepoResult(
-        controllerRepoId,
-        variantAnalysisId,
-        repo,
-        runQueryResult
-      );
+      if (runQueryResult.resultCount > 0) {
+        // Only upload results if there are any.
+        await uploadRepoResult(
+          controllerRepoId,
+          variantAnalysisId,
+          repo,
+          runQueryResult
+        );
+      }
+
       await setVariantAnalysisRepoSucceeded(
         controllerRepoId,
         variantAnalysisId,