diff --git a/packages/neon/neon/lib/src/pages/home.dart b/packages/neon/neon/lib/src/pages/home.dart
index 1e080866..b6984f94 100644
--- a/packages/neon/neon/lib/src/pages/home.dart
+++ b/packages/neon/neon/lib/src/pages/home.dart
@@ -461,7 +461,8 @@ class _HomePageState extends State<HomePage> {
                       actions: [
                         if (notificationsAppImplementation.data != null) ...[
                           StreamBuilder<int>(
-                            stream: notificationsAppImplementation.data!.getUnreadCounter(_appsBloc),
+                            stream: notificationsAppImplementation.data!
+                                .getUnreadCounter(notificationsAppImplementation.data!.getBloc(account)),
                             builder: (final context, final unreadCounterSnapshot) {
                               final unreadCount = unreadCounterSnapshot.data ?? 0;
                               return IconButton(
diff --git a/packages/neon/neon/lib/src/utils/app_implementation.dart b/packages/neon/neon/lib/src/utils/app_implementation.dart
index 961e5ca2..aa6ee3ee 100644
--- a/packages/neon/neon/lib/src/utils/app_implementation.dart
+++ b/packages/neon/neon/lib/src/utils/app_implementation.dart
@@ -37,7 +37,7 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppSpecificO
         },
       );
 
-  BehaviorSubject<int>? getUnreadCounter(final AppsBloc appsBloc);
+  BehaviorSubject<int>? getUnreadCounter(final T bloc) => null;
 
   Widget get page;
 
diff --git a/packages/neon/neon_files/lib/neon_files.dart b/packages/neon/neon_files/lib/neon_files.dart
index 66a5c320..078b3504 100644
--- a/packages/neon/neon_files/lib/neon_files.dart
+++ b/packages/neon/neon_files/lib/neon_files.dart
@@ -63,7 +63,4 @@ class FilesApp extends AppImplementation<FilesBloc, FilesAppSpecificOptions> {
 
   @override
   Widget get page => const FilesMainPage();
-
-  @override
-  BehaviorSubject<int>? getUnreadCounter(final AppsBloc appsBloc) => null;
 }
diff --git a/packages/neon/neon_news/lib/neon_news.dart b/packages/neon/neon_news/lib/neon_news.dart
index 030a11fc..31fe7a7b 100644
--- a/packages/neon/neon_news/lib/neon_news.dart
+++ b/packages/neon/neon_news/lib/neon_news.dart
@@ -71,5 +71,5 @@ class NewsApp extends AppImplementation<NewsBloc, NewsAppSpecificOptions> {
   Widget get page => const NewsMainPage();
 
   @override
-  BehaviorSubject<int> getUnreadCounter(final AppsBloc appsBloc) => appsBloc.getAppBloc<NewsBloc>(this).unreadCounter;
+  BehaviorSubject<int> getUnreadCounter(final NewsBloc bloc) => bloc.unreadCounter;
 }
diff --git a/packages/neon/neon_notes/lib/neon_notes.dart b/packages/neon/neon_notes/lib/neon_notes.dart
index 2ca34cfb..65543b61 100644
--- a/packages/neon/neon_notes/lib/neon_notes.dart
+++ b/packages/neon/neon_notes/lib/neon_notes.dart
@@ -60,7 +60,4 @@ class NotesApp extends AppImplementation<NotesBloc, NotesAppSpecificOptions> {
 
   @override
   Widget get page => const NotesMainPage();
-
-  @override
-  BehaviorSubject<int>? getUnreadCounter(final AppsBloc appsBloc) => null;
 }
diff --git a/packages/neon/neon_notifications/lib/neon_notifications.dart b/packages/neon/neon_notifications/lib/neon_notifications.dart
index 83db56d7..d7fc163c 100644
--- a/packages/neon/neon_notifications/lib/neon_notifications.dart
+++ b/packages/neon/neon_notifications/lib/neon_notifications.dart
@@ -41,6 +41,5 @@ class NotificationsApp extends AppImplementation<NotificationsBloc, Notification
   Widget get page => const NotificationsMainPage();
 
   @override
-  BehaviorSubject<int> getUnreadCounter(final AppsBloc appsBloc) =>
-      appsBloc.getAppBloc<NotificationsBloc>(this).unreadCounter;
+  BehaviorSubject<int> getUnreadCounter(final NotificationsBloc bloc) => bloc.unreadCounter;
 }