diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index c8a33d5827cb..2003864e9f3e 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -37,8 +37,12 @@ def fs_corrupted():
 def setup():
     check_bootsec()
     print("Performing initial setup")
-    os.VfsLfs2.mkfs(bdev)
-    vfs = os.VfsLfs2(bdev)
+    if bdev.info()[4] == "vfs":
+        os.VfsLfs2.mkfs(bdev)
+        vfs = os.VfsLfs2(bdev)
+    elif bdev.info()[4] == "ffat":
+        os.VfsFat.mkfs(bdev)
+        vfs = os.VfsFat(bdev)
     os.mount(vfs, "/")
     with open("boot.py", "w") as f:
         f.write(