diff --git a/source/firm.c b/source/firm.c
index 6f1730c9..cbc5537f 100755
--- a/source/firm.c
+++ b/source/firm.c
@@ -54,6 +54,9 @@ void setupCFW(void){
 
     //Determine if A9LH is installed
     if(a9lhBoot || (config >> 2) & 0x1){
+        if(pressed == SAFE_MODE)
+            error("Using Safe Mode would brick you, or remove A9LH!");
+
         a9lhSetup = 1;
         //Check setting for > 9.2 sysNAND
         updatedSys = config & 0x1;
@@ -76,9 +79,6 @@ void setupCFW(void){
 
     if(needConfig){
 
-        if(a9lhSetup && pressed == SAFE_MODE)
-            error("Using Safe Mode would brick you, or remove A9LH!");
-
         /* If L and one of the payload buttons are pressed, and if not using A9LH
            the Safe Mode combo is not pressed, chainload an external payload */
         if((pressed & BUTTON_L1) && (pressed & PAYLOAD_BUTTONS) &&