diff --git a/src/components/download/downloadButtons.js b/src/components/download/downloadButtons.js
index 69fa93309..c4e7a6bb8 100644
--- a/src/components/download/downloadButtons.js
+++ b/src/components/download/downloadButtons.js
@@ -6,6 +6,7 @@ import { materialButton } from "../../globalStyles";
 import * as helpers from "./helperFunctions";
 import { getFullAuthorInfoFromNode } from "../../util/treeMiscHelpers";
 import { getNumSelectedTips } from "../../util/treeVisibilityHelpers";
+import { getDatasetNamesFromUrl } from "../../actions/loadData";
 
 const RectangularTreeIcon = withTheme(icons.RectangularTree);
 const PanelsGridIcon = withTheme(icons.PanelsGrid);
@@ -35,6 +36,10 @@ export const DownloadButtons = ({dispatch, t, tree, entropy, metadata, colorBy,
       }
     }
   }
+  /* Verify that we can parse dataset name from URL to support Auspice JSON download */
+  const datasetNames = getDatasetNamesFromUrl(window.location.pathname);
+  const supportAuspiceJsonDownload = !gisaidProvenance && datasetNames.some(Boolean);
+
   const entropyBar = entropy?.selectedCds===nucleotide_gene ? "nucleotide" : "codon";
 
   return (
@@ -48,12 +53,12 @@ export const DownloadButtons = ({dispatch, t, tree, entropy, metadata, colorBy,
         <p/>
         {partialData ? `Currently ${selectedTipsCount}/${totalTipCount} tips are displayed and will be downloaded.` : `Currently the entire dataset (${totalTipCount} tips) will be downloaded.`}
       </div>
-      {!gisaidProvenance && (
+      {supportAuspiceJsonDownload && (
         <Button
           name="Auspice (Nextstrain) JSON"
           description={`The main Auspice dataset JSON(s) for the current view`}
           icon={<DatasetIcon width={iconWidth} selected />}
-          onClick={() => helpers.auspiceJSON(dispatch)}
+          onClick={() => helpers.auspiceJSON(dispatch, datasetNames)}
         />
       )}
       <Button
diff --git a/src/components/download/helperFunctions.js b/src/components/download/helperFunctions.js
index aa74bc67f..969cd8dc9 100644
--- a/src/components/download/helperFunctions.js
+++ b/src/components/download/helperFunctions.js
@@ -8,7 +8,7 @@ import { NODE_VISIBLE, nucleotide_gene } from "../../util/globals";
 import { datasetSummary } from "../info/datasetSummary";
 import { isColorByGenotype } from "../../util/getGenotype";
 import { EmptyNewickTreeCreated } from "../../util/exceptions";
-import { getDatasetNamesFromUrl, Dataset } from "../../actions/loadData";
+import { Dataset } from "../../actions/loadData";
 
 export const isPaperURLValid = (d) => {
   return (
@@ -623,15 +623,15 @@ export const entropyTSV = (dispatch, filePrefix, entropy) => {
 /**
  * Write out Auspice JSON(s) for the current view. We do this by re-fetching the original
  * JSON because we don't keep a copy of the unprocessed data around.
- * 
+ *
  * Sidecar files are not fetched, but we can also download them if desired.
- * 
+ *
  * Note that we are not viewing a narrative, as the download button functionality is disabled
  * for narratives.
  */
-export const auspiceJSON = (dispatch) => {
+export const auspiceJSON = (dispatch, datasetNames) => {
   const filenames = [];
-  for (const datasetName of getDatasetNamesFromUrl(window.location.pathname)) {
+  for (const datasetName of datasetNames) {
     if (!datasetName) continue; // e.g. no 2nd tree
     const filename = datasetName.replace('/', '_') + '.json';
     filenames.push(filename);
@@ -647,4 +647,4 @@ export const auspiceJSON = (dispatch) => {
     });
   }
   dispatch(infoNotification({message: `Preparing Auspice JSON(s) for download: ${filenames.join(', ')}`}));
-};
\ No newline at end of file
+};