diff --git a/lib/features/base/mixin/batch_get_label_processing_mixin.dart b/lib/features/base/mixin/batch_get_label_processing_mixin.dart
index b196d51c4..64b1c8c04 100644
--- a/lib/features/base/mixin/batch_get_label_processing_mixin.dart
+++ b/lib/features/base/mixin/batch_get_label_processing_mixin.dart
@@ -31,16 +31,16 @@ mixin BatchGetLabelProcessingMixin on HandleSetErrorMixin, SessionMixin {
     }
 
     final maxObjects = getMaxObjectsInGetMethod(session, accountId);
-    final totalEmails = labelIds.length;
-    final batchSize = max(1, min(totalEmails, maxObjects));
+    final totalLabels = labelIds.length;
+    final batchSize = max(1, min(totalLabels, maxObjects));
 
     final List<Label> allLabels = [];
     final List<Id> allNotFoundIds = [];
     State? latestState;
 
-    for (int start = 0; start < totalEmails; start += batchSize) {
+    for (int start = 0; start < totalLabels; start += batchSize) {
       int end =
-          (start + batchSize < totalEmails) ? start + batchSize : totalEmails;
+          (start + batchSize < totalLabels) ? start + batchSize : totalLabels;
       final currentListIds = labelIds.sublist(start, end);
 
       log('BatchGetLabelProcessingMixin::$debugLabel: processing batch ${start + 1} to $end');
diff --git a/lib/features/base/mixin/mail_api_mixin.dart b/lib/features/base/mixin/mail_api_mixin.dart
index 88439a716..4bde9e906 100644
--- a/lib/features/base/mixin/mail_api_mixin.dart
+++ b/lib/features/base/mixin/mail_api_mixin.dart
@@ -92,10 +92,10 @@ mixin MailAPIMixin on HandleSetErrorMixin, SessionMixin {
       );
 
       final listEmailIds = setEmailResponse?.updated?.keys.toEmailIds() ?? [];
-      final mapErrors = handleSetResponse([setEmailResponse]);
+      final batchErrors = handleSetResponse([setEmailResponse]);
 
       updatedEmailIds.addAll(listEmailIds);
-      mapErrors.addAll(mapErrors);
+      mapErrors.addAll(batchErrors);
     }
 
     return (emailIdsSuccess: updatedEmailIds, mapErrors: mapErrors);
diff --git a/lib/features/base/mixin/session_mixin.dart b/lib/features/base/mixin/session_mixin.dart
index 8b2da871a..efdd10d07 100644
--- a/lib/features/base/mixin/session_mixin.dart
+++ b/lib/features/base/mixin/session_mixin.dart
@@ -22,7 +22,7 @@ mixin SessionMixin {
       maxObjectsInSetMethod,
       CapabilityIdentifierExtension.defaultMaxObjectsInSet,
     );
-    log('$runtimeType::_getMaxObjectsInSetMethod:minOfMaxObjectsInSetMethod = $minOfMaxObjectsInSetMethod');
+    log('$runtimeType::getMaxObjectsInSetMethod:minOfMaxObjectsInSetMethod = $minOfMaxObjectsInSetMethod');
     return minOfMaxObjectsInSetMethod;
   }
 
diff --git a/lib/features/labels/data/network/label_api.dart b/lib/features/labels/data/network/label_api.dart
index 016c5b883..085435652 100644
--- a/lib/features/labels/data/network/label_api.dart
+++ b/lib/features/labels/data/network/label_api.dart
@@ -19,6 +19,8 @@ import 'package:uuid/uuid.dart';
 class LabelApi
     with HandleSetErrorMixin, SessionMixin, BatchGetLabelProcessingMixin {
 
+  static const int _defaultMaxChanges = 128;
+
   final HttpClient _httpClient;
   final Uuid _uuid;
 
@@ -179,7 +181,7 @@ class LabelApi
     final changesLabelMethod = ChangesLabelMethod(
       accountId,
       sinceState,
-      maxChanges: UnsignedInt(128),
+      maxChanges: UnsignedInt(_defaultMaxChanges),
     );
     final changesLabelInvocation =
         jmapRequestBuilder.invocation(changesLabelMethod);
diff --git a/lib/features/labels/data/repository/label_repository_impl.dart b/lib/features/labels/data/repository/label_repository_impl.dart
index ede810545..a76d971f6 100644
--- a/lib/features/labels/data/repository/label_repository_impl.dart
+++ b/lib/features/labels/data/repository/label_repository_impl.dart
@@ -50,7 +50,7 @@ class LabelRepositoryImpl extends LabelRepository {
       final changesResponse = await _labelDatasource.getLabelChanges(
         session,
         accountId,
-        sinceState,
+        newSinceState,
       );
 
       hasMoreChanges = changesResponse.hasMoreChanges;
diff --git a/lib/features/labels/presentation/extensions/handle_label_websocket_extension.dart b/lib/features/labels/presentation/extensions/handle_label_websocket_extension.dart
index e17adcf78..a04fc242d 100644
--- a/lib/features/labels/presentation/extensions/handle_label_websocket_extension.dart
+++ b/lib/features/labels/presentation/extensions/handle_label_websocket_extension.dart
@@ -36,8 +36,10 @@ extension HandleLabelWebsocketExtension on LabelController {
 
       if (refreshState is GetLabelChangesSuccess) {
         await _handleGetLabelChangesSuccess(refreshState);
-      } else {
+      } else if (refreshState != null) {
         onDataFailureViewState(refreshState);
+      } else {
+        logWarning('HandleLabelWebsocketExtension::handleWebSocketMessage: refreshState is null');
       }
     } catch (e, stackTrace) {
       logWarning(
diff --git a/lib/features/labels/presentation/utils/label_utils.dart b/lib/features/labels/presentation/utils/label_utils.dart
index dc9086a85..809697704 100644
--- a/lib/features/labels/presentation/utils/label_utils.dart
+++ b/lib/features/labels/presentation/utils/label_utils.dart
@@ -244,6 +244,10 @@ class LabelUtils {
     }
   }
 
+  /// Applies label changes to [currentLabels] **in place**.
+  ///
+  /// Removes labels matching [destroyedIds], [created], and [updated] IDs,
+  /// then appends [created] and [updated] labels.
   static void applyLabelChanges({
     required List<Label> currentLabels,
     required List<Label> created,
diff --git a/lib/features/push_notification/presentation/controller/push_base_controller.dart b/lib/features/push_notification/presentation/controller/push_base_controller.dart
index 5812c0a01..f772e40d7 100644
--- a/lib/features/push_notification/presentation/controller/push_base_controller.dart
+++ b/lib/features/push_notification/presentation/controller/push_base_controller.dart
@@ -78,7 +78,7 @@ abstract class PushBaseController {
       .nonNulls
       .toList();
 
-    log('PushBaseController::mappingTypeStateToAction():listMailboxActions: $listEmailActions');
+    log('PushBaseController::mappingTypeStateToAction():listMailboxActions: $listMailboxActions');
 
     if (listMailboxActions.isNotEmpty) {
       mailboxChangeListener.dispatchActions(listMailboxActions);
diff --git a/lib/features/push_notification/presentation/listener/label_change_listener.dart b/lib/features/push_notification/presentation/listener/label_change_listener.dart
index 932d273ac..00ff02822 100644
--- a/lib/features/push_notification/presentation/listener/label_change_listener.dart
+++ b/lib/features/push_notification/presentation/listener/label_change_listener.dart
@@ -11,11 +11,10 @@ class LabelChangeListener extends ChangeListener {
   LabelController? _labelController;
 
   LabelChangeListener._internal() {
-    try {
-      _labelController = getBinding<LabelController>();
-    } catch (e) {
-      logError(
-          'LabelChangeListener::_internal(): IS NOT REGISTERED: ${e.toString()}');
+    _labelController = getBinding<LabelController>();
+    if (_labelController == null) {
+      logWarning(
+          'LabelChangeListener::_internal(): LabelController IS NOT REGISTERED');
     }
   }