diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
index e4a9e95..c11cd2c 100644
--- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
+++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart
@@ -143,10 +143,13 @@ class EquipmentProfileContainerState extends State<EquipmentProfileContainer>
     widget.onExpand();
     _controller.forward();
     SchedulerBinding.instance.addPostFrameCallback((_) {
-      Scrollable.ensureVisible(
-        context,
-        alignmentPolicy: ScrollPositionAlignmentPolicy.keepVisibleAtEnd,
-      );
+      Future.delayed(_controller.duration!).then((_) {
+        Scrollable.ensureVisible(
+          context,
+          alignmentPolicy: ScrollPositionAlignmentPolicy.keepVisibleAtEnd,
+          duration: _controller.duration!,
+        );
+      });
     });
   }
 
diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
index 66f2a45..5307145 100644
--- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
+++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart
@@ -17,17 +17,13 @@ class EquipmentProfilesScreen extends StatefulWidget {
 }
 
 class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
-  static const maxProfiles = 5 + 1; // replace with a constant from iap
-
   final Map<String, GlobalKey<EquipmentProfileContainerState>> keysMap = {};
   int get profilesCount => keysMap.length;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    EquipmentProfiles.of(context).forEach((profile) {
-      keysMap[profile.id] ??= GlobalKey<EquipmentProfileContainerState>(debugLabel: profile.id);
-    });
+    _updateProfilesKeys();
   }
 
   @override
@@ -35,11 +31,10 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
     return SliverScreen(
       title: S.of(context).equipmentProfiles,
       appBarActions: [
-        if (profilesCount < maxProfiles)
-          IconButton(
-            onPressed: _addProfile,
-            icon: const Icon(Icons.add),
-          ),
+        IconButton(
+          onPressed: _addProfile,
+          icon: const Icon(Icons.add),
+        ),
         IconButton(
           onPressed: Navigator.of(context).pop,
           icon: const Icon(Icons.close),
@@ -55,24 +50,30 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
           : [
               SliverList(
                 delegate: SliverChildBuilderDelegate(
-                  (context, index) => index > 0 // skip default
-                      ? Padding(
-                          padding: EdgeInsets.fromLTRB(
-                            Dimens.paddingM,
-                            index == 0 ? Dimens.paddingM : 0,
-                            Dimens.paddingM,
-                            Dimens.paddingM,
-                          ),
-                          child: EquipmentProfileContainer(
-                            key: keysMap.values.toList()[index],
-                            data: EquipmentProfiles.of(context)[index],
-                            onExpand: () => _keepExpandedAt(index),
-                            onUpdate: (profileData) => _updateProfileAt(profileData, index),
-                            onDelete: () => _removeProfileAt(index),
-                          ),
-                        )
-                      : const SizedBox.shrink(),
-                  childCount: keysMap.length,
+                  (context, index) {
+                    if (index == 0) {
+                      // skip default profile
+                      return const SizedBox.shrink();
+                    }
+
+                    final profile = EquipmentProfiles.of(context)[index];
+                    return Padding(
+                      padding: EdgeInsets.fromLTRB(
+                        Dimens.paddingM,
+                        index == 0 ? Dimens.paddingM : 0,
+                        Dimens.paddingM,
+                        Dimens.paddingM,
+                      ),
+                      child: EquipmentProfileContainer(
+                        key: keysMap[profile.id],
+                        data: profile,
+                        onExpand: () => _keepExpandedAt(index),
+                        onUpdate: _updateProfileAt,
+                        onDelete: () => _removeProfileAt(profile),
+                      ),
+                    );
+                  },
+                  childCount: EquipmentProfiles.of(context).length,
                 ),
               ),
               SliverToBoxAdapter(child: SizedBox(height: MediaQuery.paddingOf(context).bottom)),
@@ -91,12 +92,12 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
     });
   }
 
-  void _updateProfileAt(EquipmentProfile data, int index) {
+  void _updateProfileAt(EquipmentProfile data) {
     EquipmentProfileProvider.of(context).updateProdile(data);
   }
 
-  void _removeProfileAt(int index) {
-    EquipmentProfileProvider.of(context).deleteProfile(EquipmentProfiles.of(context)[index]);
+  void _removeProfileAt(EquipmentProfile data) {
+    EquipmentProfileProvider.of(context).deleteProfile(data);
   }
 
   void _keepExpandedAt(int index) {
@@ -107,6 +108,31 @@ class _EquipmentProfilesScreenState extends State<EquipmentProfilesScreen> {
       element.currentState?.collapse();
     });
   }
+
+  void _updateProfilesKeys() {
+    final profiles = EquipmentProfiles.of(context);
+    if (profiles.length > keysMap.length) {
+      // profile added
+      final List<String> idsToAdd = [];
+      for (final profile in profiles) {
+        if (!keysMap.keys.contains(profile.id)) idsToAdd.add(profile.id);
+      }
+      for (final id in idsToAdd) {
+        keysMap[id] = GlobalKey<EquipmentProfileContainerState>(debugLabel: id);
+      }
+      idsToAdd.clear();
+    } else if (profiles.length < keysMap.length) {
+      // profile deleted
+      final List<String> idsToDelete = [];
+      for (final id in keysMap.keys) {
+        if (!profiles.any((p) => p.id == id)) idsToDelete.add(id);
+      }
+      idsToDelete.forEach(keysMap.remove);
+      idsToDelete.clear();
+    } else {
+      // profile updated, no need to updated keys
+    }
+  }
 }
 
 class _EquipmentProfilesListPlaceholder extends StatelessWidget {