diff --git a/packages/client/src/pages/datasets/DatasetDownloads.tsx b/packages/client/src/pages/datasets/DatasetDownloads.tsx
index b543c7b..2073258 100644
--- a/packages/client/src/pages/datasets/DatasetDownloads.tsx
+++ b/packages/client/src/pages/datasets/DatasetDownloads.tsx
@@ -64,7 +64,8 @@ export const DatasetDownloads: React.FC = () => {
       width: 200,
       headerName: t('components.datasetDownload.entryDownload'),
       renderCell: (params) =>
-        params.value && (
+        params.value &&
+        params.row.status == DownloadStatus.Ready && (
           <IconButton href={params.value}>
             <Download />
           </IconButton>
diff --git a/packages/client/src/pages/studies/StudyDownloads.tsx b/packages/client/src/pages/studies/StudyDownloads.tsx
index a78a66d..a7562a5 100644
--- a/packages/client/src/pages/studies/StudyDownloads.tsx
+++ b/packages/client/src/pages/studies/StudyDownloads.tsx
@@ -57,7 +57,8 @@ export const StudyDownloads: React.FC = () => {
       width: 200,
       headerName: t('components.datasetDownload.entryDownload'),
       renderCell: (params) =>
-        params.value && (
+        params.value &&
+        params.row.status == DownloadStatus.Ready && (
           <IconButton href={params.value}>
             <Download />
           </IconButton>
@@ -68,7 +69,8 @@ export const StudyDownloads: React.FC = () => {
       width: 200,
       headerName: t('components.studyDownload.csv'),
       renderCell: (params) =>
-        params.value && (
+        params.value &&
+        params.row.status == DownloadStatus.Ready && (
           <IconButton href={params.value}>
             <Download />
           </IconButton>
@@ -79,7 +81,8 @@ export const StudyDownloads: React.FC = () => {
       width: 200,
       headerName: t('components.studyDownload.taggedEntries'),
       renderCell: (params) =>
-        params.value && (
+        params.value &&
+        params.row.status == DownloadStatus.Ready && (
           <IconButton href={params.value}>
             <Download />
           </IconButton>
diff --git a/packages/server/src/download-request/services/study-download-request.service.ts b/packages/server/src/download-request/services/study-download-request.service.ts
index 7e3475a..48fb392 100644
--- a/packages/server/src/download-request/services/study-download-request.service.ts
+++ b/packages/server/src/download-request/services/study-download-request.service.ts
@@ -90,7 +90,6 @@ export class StudyDownloadService {
     request = (await this.downloadRequestModel.findById(request._id))!;
 
     // Download the entries that were generated as part of this study
-    /*
     await this.downloadService.startZipJob({
       entryJSONLocation: request.entryJSONLocation!,
       entryZIPLocation: request.entryZIPLocation!,
@@ -108,11 +107,9 @@ export class StudyDownloadService {
       bucket: (await this.bucketFactory.getBucket(request.organization))!,
       organization: request.organization
     });
-    */
     // Download the tag data as a CSV
     await this.generateCSV(request);
     // Download the entries that were tagged in this study
-    /*
     await this.downloadService.startZipJob({
       entryJSONLocation: request.taggedEntriesJSONLocation!,
       entryZIPLocation: request.taggedEntriesZipLocation!,
@@ -129,7 +126,7 @@ export class StudyDownloadService {
       entries: await this.getLabeledEntries(request),
       bucket: (await this.bucketFactory.getBucket(request.organization))!,
       organization: request.organization
-    }); */
+    });
 
     return request;
   }