diff --git a/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart b/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart
index 1701282..65a73b5 100644
--- a/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart
+++ b/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart
@@ -1,28 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lightmeter/generated/l10n.dart';
 import 'package:lightmeter/providers/equipment_profile_provider.dart';
-import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart';
-import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/animated_dialog_picker/widget_picker_dialog_animated.dart';
 import 'package:lightmeter/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart';
 import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart';
 
-class EquipmentProfilePicker extends StatefulWidget {
+class EquipmentProfilePicker extends StatelessWidget {
   const EquipmentProfilePicker();
 
-  @override
-  State<EquipmentProfilePicker> createState() => _EquipmentProfilePickerState();
-}
-
-class _EquipmentProfilePickerState extends State<EquipmentProfilePicker> {
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final profile = EquipmentProfiles.selectedOf(context);
-    context.read<MeteringCommunicationBloc>().add(EquipmentProfileChangedEvent(profile));
-  }
-
   @override
   Widget build(BuildContext context) {
     return AnimatedDialogPicker<EquipmentProfile>(
@@ -31,10 +16,7 @@ class _EquipmentProfilePickerState extends State<EquipmentProfilePicker> {
       selectedValue: EquipmentProfiles.selectedOf(context),
       values: EquipmentProfiles.inUseOf(context),
       itemTitleBuilder: (_, value) => Text(value.id.isEmpty ? S.of(context).none : value.name),
-      onChanged: (profile) {
-        EquipmentProfilesProvider.of(context).selectProfile(profile);
-        context.read<MeteringCommunicationBloc>().add(EquipmentProfileChangedEvent(profile));
-      },
+      onChanged: EquipmentProfilesProvider.of(context).selectProfile,
       closedChild: ReadingValueContainer.singleValue(
         value: ReadingValue(
           label: S.of(context).equipmentProfile,