diff --git a/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/attire_module.dart b/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/attire_module.dart
index 3d1bc3ff..f574b6d1 100644
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/attire_module.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/attire_module.dart
@@ -33,7 +33,7 @@ class StaffAttireModule extends Module {
     i.addLazySingleton(UploadAttirePhotoUseCase.new);
 
     // BLoC
-    i.addLazySingleton(AttireCubit.new);
+    i.add(AttireCubit.new);
     i.add(AttireCaptureCubit.new);
   }
 
diff --git a/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/data/repositories_impl/attire_repository_impl.dart b/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/data/repositories_impl/attire_repository_impl.dart
index 9b59a8e7..65645ad8 100644
--- a/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/data/repositories_impl/attire_repository_impl.dart
+++ b/apps/mobile/packages/features/staff/profile_sections/onboarding/attire/lib/src/data/repositories_impl/attire_repository_impl.dart
@@ -36,10 +36,6 @@ class AttireRepositoryImpl implements AttireRepository {
 
   @override
   Future<AttireItem> uploadPhoto(String itemId, String filePath) async {
-    // 6. Return updated AttireItem by re-fetching to get the PENDING/SUCCESS status
-    final List<AttireItem> finalOptions = await _connector.getAttireOptions();
-    return finalOptions.firstWhere((AttireItem e) => e.id == itemId);
-
     // 1. Upload file to Core API
     final FileUploadService uploadService = Modular.get<FileUploadService>();
     final FileUploadResponse uploadRes = await uploadService.uploadFile(
@@ -108,8 +104,8 @@ class AttireRepositoryImpl implements AttireRepository {
     );
 
     // 6. Return updated AttireItem by re-fetching to get the PENDING/SUCCESS status
-    // final List<AttireItem> finalOptions = await _connector.getAttireOptions();
-    // return finalOptions.firstWhere((AttireItem e) => e.id == itemId);
+    final List<AttireItem> finalOptions = await _connector.getAttireOptions();
+    return finalOptions.firstWhere((AttireItem e) => e.id == itemId);
   }
 
   AttireVerificationStatus _mapToAttireStatus(VerificationStatus status) {