diff --git a/applications/external/mass_storage/mass_storage_app.c b/applications/external/mass_storage/mass_storage_app.c
index 99075e6c4..ccb3369d9 100644
--- a/applications/external/mass_storage/mass_storage_app.c
+++ b/applications/external/mass_storage/mass_storage_app.c
@@ -44,12 +44,29 @@ MassStorageApp* mass_storage_app_alloc(char* arg) {
         furi_string_set_str(app->file_path, MASS_STORAGE_APP_PATH_FOLDER);
     }
 
-    app->create_image_size = 7; // 128MB
-
     app->gui = furi_record_open(RECORD_GUI);
     app->fs_api = furi_record_open(RECORD_STORAGE);
     app->dialogs = furi_record_open(RECORD_DIALOGS);
 
+    app->create_image_size = (uint8_t)-1;
+    SDInfo sd_info;
+    if(storage_sd_info(app->fs_api, &sd_info) == FSE_OK) {
+        switch(sd_info.fs_type) {
+        case FST_FAT12:
+            app->create_image_max = 16LL * 1024 * 1024;
+            break;
+        case FST_FAT16:
+            app->create_image_max = 2LL * 1024 * 1024 * 1024;
+            break;
+        case FST_FAT32:
+            app->create_image_max = 4LL * 1024 * 1024 * 1024;
+            break;
+        default:
+            app->create_image_max = 0;
+            break;
+        }
+    }
+
     app->view_dispatcher = view_dispatcher_alloc();
     view_dispatcher_enable_queue(app->view_dispatcher);
 
diff --git a/applications/external/mass_storage/mass_storage_app_i.h b/applications/external/mass_storage/mass_storage_app_i.h
index c5de75b9b..1901fb10a 100644
--- a/applications/external/mass_storage/mass_storage_app_i.h
+++ b/applications/external/mass_storage/mass_storage_app_i.h
@@ -33,6 +33,7 @@ struct MassStorageApp {
     Popup* popup;
     Loading* loading;
 
+    uint64_t create_image_max;
     uint8_t create_image_size;
     char create_image_name[MASS_STORAGE_FILE_NAME_LEN];
 
diff --git a/applications/external/mass_storage/scenes/mass_storage_scene_create_image.c b/applications/external/mass_storage/scenes/mass_storage_scene_create_image.c
index 787a416a7..cbf911dc2 100644
--- a/applications/external/mass_storage/scenes/mass_storage_scene_create_image.c
+++ b/applications/external/mass_storage/scenes/mass_storage_scene_create_image.c
@@ -28,8 +28,14 @@ static const struct {
     {"512MB", 512LL * 1024 * 1024},
     {"1GB", 1LL * 1024 * 1024 * 1024},
     {"2GB", 2LL * 1024 * 1024 * 1024},
-    {"3GB", 3LL * 1024 * 1024 * 1024},
-    {"4GB", 4LL * 1024 * 1024 * 1024 - 1},
+    {"4GB", 4LL * 1024 * 1024 * 1024},
+    {"8GB", 8LL * 1024 * 1024 * 1024},
+    {"16GB", 16LL * 1024 * 1024 * 1024},
+    {"32GB", 32LL * 1024 * 1024 * 1024},
+    {"64GB", 64LL * 1024 * 1024 * 1024},
+    {"128GB", 128LL * 1024 * 1024 * 1024},
+    {"256GB", 256LL * 1024 * 1024 * 1024},
+    {"512GB", 512LL * 1024 * 1024 * 1024},
 };
 static void mass_storage_scene_create_image_image_size_changed(VariableItem* item) {
     MassStorageApp* app = variable_item_get_context(item);
@@ -42,10 +48,22 @@ void mass_storage_scene_create_image_on_enter(void* context) {
     VariableItemList* var_item_list = app->var_item_list;
     VariableItem* item;
 
+    uint8_t size_count = COUNT_OF(image_sizes);
+    if(app->create_image_max) {
+        for(size_t i = 1; i < size_count; i++) {
+            if(image_sizes[i].value > app->create_image_max) {
+                size_count = i;
+                break;
+            }
+        }
+    }
+    if(app->create_image_size == (uint8_t)-1) {
+        app->create_image_size = CLAMP(7, size_count - 2, 0); // 7 = 128MB
+    }
     item = variable_item_list_add(
         var_item_list,
         "Image Size",
-        COUNT_OF(image_sizes),
+        size_count,
         mass_storage_scene_create_image_image_size_changed,
         app);
     variable_item_set_current_value_index(item, app->create_image_size);
@@ -107,7 +125,11 @@ bool mass_storage_scene_create_image_on_event(void* context, SceneManagerEvent e
             const char* error = NULL;
             if(storage_file_open(
                    app->file, furi_string_get_cstr(app->file_path), FSAM_WRITE, FSOM_CREATE_NEW)) {
-                if(!storage_file_expand(app->file, image_sizes[app->create_image_size].value)) {
+                uint64_t size = image_sizes[app->create_image_size].value;
+                if(size == app->create_image_max) {
+                    size--;
+                }
+                if(!storage_file_expand(app->file, size)) {
                     error = storage_file_get_error_desc(app->file);
                     storage_file_close(app->file);
                     storage_common_remove(app->fs_api, furi_string_get_cstr(app->file_path));