diff --git a/lib/features/composer/presentation/composer_bindings.dart b/lib/features/composer/presentation/composer_bindings.dart
index 1b0e37bcb..7c4aee891 100644
--- a/lib/features/composer/presentation/composer_bindings.dart
+++ b/lib/features/composer/presentation/composer_bindings.dart
@@ -391,6 +391,6 @@ class ComposerBindings extends BaseBindings {
 
     Get.delete<FileUploader>(tag: composerId);
 
-    IdentityInteractorsBindings().dispose();
+    IdentityInteractorsBindings(composerId: composerId).dispose();
   }
 }
\ No newline at end of file
diff --git a/test/features/search/verify_before_time_in_search_email_filter_test.dart b/test/features/search/verify_before_time_in_search_email_filter_test.dart
index 39e430eb4..2e2ad415f 100644
--- a/test/features/search/verify_before_time_in_search_email_filter_test.dart
+++ b/test/features/search/verify_before_time_in_search_email_filter_test.dart
@@ -348,7 +348,6 @@ void main() {
       getRestoredDeletedMessageInteractor,
       removeComposerCacheOnWebInteractor,
       getAllIdentitiesInteractor,
-      composerManager,
     );
 
     when(emailReceiveManager.pendingSharedFileInfo).thenAnswer((_) => BehaviorSubject.seeded([]));