diff --git a/lib/presentation/main_tab_page.dart b/lib/presentation/main_tab_page.dart
index ab8af6a5..cfa4ab2a 100644
--- a/lib/presentation/main_tab_page.dart
+++ b/lib/presentation/main_tab_page.dart
@@ -109,7 +109,10 @@ class _MainTabPageState extends State<MainTabPage> with SingleTickerProviderStat
     WidgetsBinding.instance.removeObserver(this);
     _tabController.dispose();
     for (final sc in _tabItemScrollControllers) {
-      sc.dispose();
+      //the controller may have been already disposed
+      if (sc.hasClients) {
+        sc.dispose();
+      }
     }
     super.dispose();
   }
diff --git a/lib/presentation/shared/mixins/app_fab_mixin.dart b/lib/presentation/shared/mixins/app_fab_mixin.dart
index 727aa8bb..4474555c 100644
--- a/lib/presentation/shared/mixins/app_fab_mixin.dart
+++ b/lib/presentation/shared/mixins/app_fab_mixin.dart
@@ -19,7 +19,6 @@ mixin AppFabMixin<T extends StatefulWidget> on State<T>, SingleTickerProviderSta
   void dispose() {
     scrollController.dispose();
     hideFabAnimController.dispose();
-
     super.dispose();
   }