diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp
index 6cd17dac8..df46c1941 100644
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -55,6 +55,15 @@ extern "C" void lfs_assert(const char *reason)
 {
     LOG_ERROR("LFS assert: %s", reason);
     lfs_assert_failed = true;
+
+#ifndef ARCH_PORTDUINO
+#ifdef FSCom
+    // CORRUPTED FILESYSTEM. This causes bootloop so
+    // might as well try formatting now.
+    LOG_ERROR("Trying FSCom.format()");
+    FSCom.format();
+#endif
+#endif
 }
 
 /**