diff --git a/lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart b/lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart
index 40d51d2b..455dff23 100644
--- a/lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart
+++ b/lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart
@@ -46,11 +46,11 @@ class AirQualityDistributionBloc
     }
   }
 
-  Future<void> _onClearAirQualityDistribution(
+  void _onClearAirQualityDistribution(
     ClearAirQualityDistribution event,
     Emitter<AirQualityDistributionState> emit,
-  ) async {
-    emit(const AirQualityDistributionState());
+  ) {
+    emit(AirQualityDistributionState(selectedAqiType: state.selectedAqiType));
   }
 
   void _onUpdateAqiTypeEvent(
diff --git a/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart b/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart
index 88c3715e..326a87a2 100644
--- a/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart
+++ b/lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart
@@ -75,6 +75,6 @@ class RangeOfAqiBloc extends Bloc<RangeOfAqiEvent, RangeOfAqiState> {
     ClearRangeOfAqiEvent event,
     Emitter<RangeOfAqiState> emit,
   ) {
-    emit(const RangeOfAqiState());
+    emit(RangeOfAqiState(selectedAqiType: state.selectedAqiType));
   }
 }
diff --git a/lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart b/lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart
index f7be6ee3..7b6b113a 100644
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart
@@ -34,6 +34,7 @@ class AqiDistributionChartTitle extends StatelessWidget {
             alignment: AlignmentDirectional.centerEnd,
             fit: BoxFit.scaleDown,
             child: AqiTypeDropdown(
+              selectedAqiType: context.watch<AirQualityDistributionBloc>().state.selectedAqiType,
               onChanged: (value) {
                 if (value != null) {
                   final bloc = context.read<AirQualityDistributionBloc>();
diff --git a/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart b/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart
index 6640c717..8233fe5a 100644
--- a/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart
@@ -18,19 +18,20 @@ enum AqiType {
 }
 
 class AqiTypeDropdown extends StatefulWidget {
-  const AqiTypeDropdown({super.key, required this.onChanged});
+  const AqiTypeDropdown({
+    required this.onChanged,
+    this.selectedAqiType,
+    super.key,
+  });
 
   final ValueChanged<AqiType?> onChanged;
+  final AqiType? selectedAqiType;
 
   @override
   State<AqiTypeDropdown> createState() => _AqiTypeDropdownState();
 }
 
 class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
-  AqiType? _selectedItem = AqiType.aqi;
-
-  void _updateSelectedItem(AqiType? item) => setState(() => _selectedItem = item);
-
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -41,8 +42,8 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
           width: 1,
         ),
       ),
-      child: DropdownButton<AqiType?>(
-        value: _selectedItem,
+      child: DropdownButton<AqiType>(
+        value: widget.selectedAqiType,
         isDense: true,
         borderRadius: BorderRadius.circular(16),
         dropdownColor: ColorsManager.whiteColors,
@@ -59,10 +60,7 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
         items: AqiType.values
             .map((e) => DropdownMenuItem(value: e, child: Text(e.value)))
             .toList(),
-        onChanged: (value) {
-          _updateSelectedItem(value);
-          widget.onChanged(value);
-        },
+        onChanged: widget.onChanged,
       ),
     );
   }
diff --git a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart
index 1b0da288..421fbb13 100644
--- a/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart
+++ b/lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart
@@ -63,15 +63,15 @@ class RangeOfAqiChartTitle extends StatelessWidget {
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerEnd,
             child: AqiTypeDropdown(
+              selectedAqiType: context.watch<RangeOfAqiBloc>().state.selectedAqiType,
               onChanged: (value) {
                 final spaceTreeState = context.read<SpaceTreeBloc>().state;
                 final spaceUuid = spaceTreeState.selectedSpaces.firstOrNull;
-
-                if (spaceUuid == null) return;
-
                 if (value != null) {
                   context.read<RangeOfAqiBloc>().add(UpdateAqiTypeEvent(value));
                 }
+
+                if (spaceUuid == null) return;
               },
             ),
           ),