diff --git a/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart b/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart
index a8107ec1..94a359f2 100644
--- a/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart
+++ b/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_bloc.dart
@@ -3,17 +3,16 @@ import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
 
 part 'analytics_tab_event.dart';
-part 'analytics_tab_state.dart';
 
-class AnalyticsTabBloc extends Bloc<AnalyticsTabEvent, AnalyticsTabState> {
-  AnalyticsTabBloc() : super(const AnalyticsTabState()) {
+class AnalyticsTabBloc extends Bloc<AnalyticsTabEvent, AnalyticsPageTab> {
+  AnalyticsTabBloc() : super(AnalyticsPageTab.energyManagement) {
     on<UpdateAnalyticsTabEvent>(_onUpdateAnalyticsTabEvent);
   }
 
   void _onUpdateAnalyticsTabEvent(
     UpdateAnalyticsTabEvent event,
-    Emitter<AnalyticsTabState> emit,
+    Emitter<AnalyticsPageTab> emit,
   ) {
-    emit(state.copyWith(selectedTab: event.analyticsTab));
+    emit(event.analyticsTab);
   }
 }
diff --git a/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_state.dart b/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_state.dart
deleted file mode 100644
index c1366796..00000000
--- a/lib/pages/analytics/modules/analytics/blocs/bloc/analytics_tab_state.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-part of 'analytics_tab_bloc.dart';
-
-final class AnalyticsTabState extends Equatable {
-  const AnalyticsTabState({
-    this.selectedTab = AnalyticsPageTab.energyManagement,
-  });
-
-  final AnalyticsPageTab selectedTab;
-
-  AnalyticsTabState copyWith({
-    AnalyticsPageTab? selectedTab,
-  }) {
-    return AnalyticsTabState(
-      selectedTab: selectedTab ?? this.selectedTab,
-    );
-  }
-
-  @override
-  List<Object> get props => [selectedTab];
-}
diff --git a/lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart b/lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart
index 07d8d0e2..c3281a43 100644
--- a/lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart
+++ b/lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart
@@ -11,9 +11,9 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<AnalyticsTabBloc, AnalyticsTabState>(
-      buildWhen: (previous, current) => previous.selectedTab != current.selectedTab,
-      builder: (context, state) => Column(
+    return BlocBuilder<AnalyticsTabBloc, AnalyticsPageTab>(
+      buildWhen: (previous, current) => previous != current,
+      builder: (context, selectedTab) => Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: [
@@ -21,10 +21,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
             child: Container(
               width: MediaQuery.sizeOf(context).width * 1,
               decoration: subSectionContainerDecoration,
-              padding: const EdgeInsets.symmetric(
-                horizontal: 32,
-                // vertical: 48,
-              ),
+              padding: const EdgeInsets.symmetric(horizontal: 32),
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.start,
@@ -44,7 +41,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
                           ...AnalyticsPageTab.values.map(
                             (tab) => AnalyticsPageTabButton(
                               tab: tab,
-                              isSelected: tab == state.selectedTab,
+                              isSelected: tab == selectedTab,
                             ),
                           ),
                         ],
@@ -71,7 +68,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
               child: AnimatedSwitcher(
                 switchInCurve: Curves.easeIn,
                 duration: const Duration(milliseconds: 200),
-                child: state.selectedTab.child,
+                child: selectedTab.child,
               ),
             ),
           ),