diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart
index c6c5ae011..d95bffe09 100644
--- a/lib/blocs/upload/upload_cubit.dart
+++ b/lib/blocs/upload/upload_cubit.dart
@@ -64,7 +64,7 @@ class UploadCubit extends Cubit<UploadState> {
         _arnsRepository = arnsRepository,
         _uploadRepository = uploadRepository,
         _uploadThumbnail = configService.config.uploadThumbnails,
-        super(UploadLoadingFiles());
+        super(uploadFolders ? UploadLoadingFolders() : UploadLoadingFiles());
 
   // Dependencies
   final UploadRepository _uploadRepository;
diff --git a/lib/blocs/upload/upload_state.dart b/lib/blocs/upload/upload_state.dart
index 906508471..ae358c487 100644
--- a/lib/blocs/upload/upload_state.dart
+++ b/lib/blocs/upload/upload_state.dart
@@ -306,3 +306,5 @@ enum UploadErrors {
   turboTimeout,
   unknown,
 }
+
+class UploadLoadingFolders extends UploadState {}
diff --git a/lib/components/upload_form.dart b/lib/components/upload_form.dart
index 10386153f..f31c413af 100644
--- a/lib/components/upload_form.dart
+++ b/lib/components/upload_form.dart
@@ -60,34 +60,32 @@ Future<void> promptToUpload(
 }) async {
   final driveDetailCubit = context.read<DriveDetailCubit>();
 
-  final uploadCubit = BlocProvider<UploadCubit>(
-    create: (context) {
-      final cubit = UploadCubit(
-        activityTracker: context.read<ActivityTracker>(),
-        arDriveUploadManager: context.read<ArDriveUploadPreparationManager>(),
-        uploadFileSizeChecker: context.read<UploadFileSizeChecker>(),
-        driveId: driveId,
-        parentFolderId: parentFolderId,
-        profileCubit: context.read<ProfileCubit>(),
-        driveDao: context.read<DriveDao>(),
-        uploadFolders: isFolderUpload,
-        auth: context.read<ArDriveAuth>(),
-        configService: context.read<ConfigService>(),
-        arnsRepository: context.read<ARNSRepository>(),
-        uploadRepository: context.read<UploadRepository>(),
-      );
+  final cubit = UploadCubit(
+    activityTracker: context.read<ActivityTracker>(),
+    arDriveUploadManager: context.read<ArDriveUploadPreparationManager>(),
+    uploadFileSizeChecker: context.read<UploadFileSizeChecker>(),
+    driveId: driveId,
+    parentFolderId: parentFolderId,
+    profileCubit: context.read<ProfileCubit>(),
+    driveDao: context.read<DriveDao>(),
+    uploadFolders: isFolderUpload,
+    auth: context.read<ArDriveAuth>(),
+    configService: context.read<ConfigService>(),
+    arnsRepository: context.read<ARNSRepository>(),
+    uploadRepository: context.read<UploadRepository>(),
+  );
 
-      if (files != null) {
-        cubit.selectFiles(files, parentFolderId);
-      } else if (isFolderUpload) {
-        cubit.pickFilesFromFolder(
-            context: context, parentFolderId: parentFolderId);
-      } else {
-        cubit.pickFiles(context: context, parentFolderId: parentFolderId);
-      }
+  if (files != null) {
+    cubit.selectFiles(files, parentFolderId);
+  } else if (isFolderUpload) {
+    await cubit.pickFilesFromFolder(
+        context: context, parentFolderId: parentFolderId);
+  } else {
+    cubit.pickFiles(context: context, parentFolderId: parentFolderId);
+  }
 
-      return cubit;
-    },
+  final uploadCubit = BlocProvider<UploadCubit>(
+    create: (context) => cubit,
   );
 
   final uploadPaymentMethodBloc = BlocProvider(