diff --git a/app/Jobs/RunReport.php b/app/Jobs/RunReport.php
index 1efb5d994161..da9967a861c4 100644
--- a/app/Jobs/RunReport.php
+++ b/app/Jobs/RunReport.php
@@ -78,7 +78,7 @@ class RunReport extends Job
             'endDate' => $endDate,
             'report' => $report,
         ];
-        
+
         $report->exportParams = array_merge($params, $report->results());
 
         return $report;
diff --git a/resources/views/reports/report_builder.blade.php b/resources/views/reports/report_builder.blade.php
index b90bdacd338d..4b7ad5a688a7 100644
--- a/resources/views/reports/report_builder.blade.php
+++ b/resources/views/reports/report_builder.blade.php
@@ -436,6 +436,7 @@
 
 		$('#format').change(function() {
 			var val = $('#format').val();
+			$('#scheduleButton').prop('disabled', val == 'zip');
             if (isStorageSupported() && val != 'zip') {
                 localStorage.setItem('last:report_format', val);
             }
@@ -446,6 +447,7 @@
 			setFiltersShown();
 			setDocumentZipShown();
 			setScheduleButton();
+			$('#scheduleButton').prop('disabled', $('#format').val() == 'zip');
             if (isStorageSupported()) {
                 localStorage.setItem('last:report_type', val);
             }