diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index db5d01ca..ea19e90f 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1141,7 +1141,9 @@ def run_hw_tests(state):
   show_results(state)
 
   # Upload for review
-  if ENABLED_UPLOAD_DATA and ask('Upload results for review?'):
+  if (ENABLED_UPLOAD_DATA
+      and DEBUG_MODE
+      and ask('Upload results for review?')):
     try_and_print(
       message='Saving debug reports...',
       function=save_debug_reports,