diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 331289c8..d8eedf4c 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1525,7 +1525,7 @@ def run_nvme_smart_tests(state, test, update_mode=False):
       test.failed = True
       test.update_status('FAIL')
   elif dev.smart_attributes:
-    if dev.disk_ok and dev.self_test_passed:
+    if dev.disk_ok and dev.self_test_passed and 'OVERRIDE' not in test.status:
       test.passed = True
       test.update_status('PASS')
     elif test.aborted: