diff --git a/main.c b/main.c
index 3f9d0f2cae..e0d99e3143 100644
--- a/main.c
+++ b/main.c
@@ -813,7 +813,7 @@ int __attribute__((used)) main(void) {
     // no SPI flash filesystem, and we might erase the existing one.
 
     // Check whether CIRCUITPY is available. Don't check if it already hasn't been found.
-    if (safe_mode != NO_CIRCUITPY && !filesystem_init(safe_mode == NO_SAFE_MODE, false)) {
+    if ((safe_mode != NO_CIRCUITPY) && !filesystem_init(safe_mode == NO_SAFE_MODE, false)) {
         reset_into_safe_mode(NO_CIRCUITPY);
     }
 
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 62006baf98..4cb9d7ad61 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -177,6 +177,7 @@ void print_safe_mode_message(safe_mode_t reason) {
             break;
         case NO_CIRCUITPY:
             message = translate("CIRCUITPY drive could not be found or created.");
+            break;
         default:
             break;
     }