diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 141d324e..a4bc4f5f 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1073,6 +1073,13 @@ def run_nvme_smart_tests(state, test):
     if not (test.dev.disk_ok or 'OVERRIDE' in test.status):
       test.failed = True
       test.update_status('NS')
+    elif state.quick_mode:
+      if test.dev.disk_ok:
+        test.passed = True
+        test.update_status('CS')
+      else:
+        test.failed = True
+        test.update_status('NS')
     else:
       # Prep
       test.timeout = test.dev.smart_self_test['polling_minutes'].get(
@@ -1141,6 +1148,9 @@ def run_nvme_smart_tests(state, test):
             test.dev.tests[t].update_status('Denied')
             test.dev.tests[t].disabled = True
 
+      # Cleanup
+      tmux_kill_pane(state.panes['smart'])
+
   # Save report
   test.report = test.dev.generate_report(
     short_test=_include_short_test)
@@ -1148,9 +1158,6 @@ def run_nvme_smart_tests(state, test):
   # Done
   update_progress_pane(state)
 
-  # Cleanup
-  tmux_kill_pane(state.panes['smart'])
-
 def secret_screensaver(screensaver=None):
   """Show screensaver."""
   if screensaver == 'matrix':