diff --git a/src/script/main/app.ts b/src/script/main/app.ts
index 340ab4d8c8c..660aefb5f2e 100644
--- a/src/script/main/app.ts
+++ b/src/script/main/app.ts
@@ -492,10 +492,10 @@ export class App {
       telemetry.timeStep(AppInitTimingsStep.UPDATED_FROM_NOTIFICATIONS);
       telemetry.addStatistic(AppInitStatisticsValue.NOTIFICATIONS, totalNotifications, 100);
 
-      eventTrackerRepository.init(propertiesRepository.properties.settings.privacy.telemetry_sharing);
       onProgress(97.5, t('initUpdatedFromNotifications', this.config.BRAND_NAME));
 
       const clientEntities = await clientRepository.updateClientsForSelf();
+      await eventTrackerRepository.init(propertiesRepository.properties.settings.privacy.telemetry_sharing);
 
       onProgress(99);
 
diff --git a/src/script/mls/MLSConversations.ts b/src/script/mls/MLSConversations.ts
index a7e8f3246f2..4ea7d001c52 100644
--- a/src/script/mls/MLSConversations.ts
+++ b/src/script/mls/MLSConversations.ts
@@ -75,10 +75,7 @@ export async function initMLSGroupConversations(
 
       //otherwise we should try joining via external commit
       await conversationService.joinByExternalCommit(qualifiedId);
-
-      if (onSuccessfulJoin) {
-        return onSuccessfulJoin(mlsConversation);
-      }
+      onSuccessfulJoin?.(mlsConversation);
     } catch (error) {
       onError?.(mlsConversation, error);
     }