diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4505582d8..4899c5ee4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -144,6 +144,11 @@
                 android:name="ch.protonmail.android.onboarding.base.presentation.StartOnboardingObserverInitializer"
                 android:value="androidx.startup"
                 tools:node="remove" />
+
+            <meta-data
+                android:name="ch.protonmail.android.featureflags.FeatureFlagsInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
         </provider>
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/app/src/main/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepository.kt b/app/src/main/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepository.kt
index 024572756..848bdce2e 100644
--- a/app/src/main/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepository.kt
+++ b/app/src/main/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepository.kt
@@ -20,6 +20,7 @@
 package ch.protonmail.android.feature.rating
 
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -27,12 +28,12 @@ import javax.inject.Singleton
 class MailboxScreenViewInMemoryRepository @Inject constructor() {
 
     public val screenViewCount: Int
-        get() = mailboxScreenViews
+        get() = mailboxScreenViews.get()
 
-    private var mailboxScreenViews: Int = 0
+    private var mailboxScreenViews = AtomicInteger(0)
 
     fun recordScreenView() {
-        mailboxScreenViews++
+        mailboxScreenViews.incrementAndGet()
         Timber.d("Recording mailbox screen view: count $mailboxScreenViews")
     }
 
diff --git a/app/src/main/java/ch/protonmail/android/featureflags/RefreshFeatureFlags.kt b/app/src/main/java/ch/protonmail/android/featureflags/RefreshFeatureFlags.kt
index bde61ac1c..5de04a291 100644
--- a/app/src/main/java/ch/protonmail/android/featureflags/RefreshFeatureFlags.kt
+++ b/app/src/main/java/ch/protonmail/android/featureflags/RefreshFeatureFlags.kt
@@ -19,7 +19,6 @@
 
 package ch.protonmail.android.featureflags
 
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import me.proton.core.accountmanager.domain.AccountManager
@@ -38,12 +37,14 @@ class RefreshFeatureFlags @Inject constructor(
 
     private val scope get() = scopeProvider.GlobalIOSupervisedScope
 
-    fun refresh(): Job = scope.launch {
-        val accounts = accountManager.getAccounts().firstOrNull() ?: return@launch
-        Timber.d("Refreshing feature flags for ${accounts.count()} accounts")
-        accounts.map { it.userId }.forEach { userId ->
-            refreshCachedShowRatingsFeatureFlag(userId)
-            Timber.d("Rating feature flag refreshed for user $userId")
+    fun refresh() {
+        scope.launch {
+            val accounts = accountManager.getAccounts().firstOrNull() ?: return@launch
+            Timber.d("Refreshing feature flags for ${accounts.count()} accounts")
+            accounts.map { it.userId }.forEach { userId ->
+                refreshCachedShowRatingsFeatureFlag(userId)
+                Timber.d("Rating feature flag refreshed for user $userId")
+            }
         }
     }
 
diff --git a/app/src/test/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepositoryTest.kt b/app/src/test/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepositoryTest.kt
index 5f910245a..9e260fb43 100644
--- a/app/src/test/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepositoryTest.kt
+++ b/app/src/test/java/ch/protonmail/android/feature/rating/MailboxScreenViewInMemoryRepositoryTest.kt
@@ -28,7 +28,7 @@ class MailboxScreenViewInMemoryRepositoryTest {
     private val showReviewAppRepository = MailboxScreenViewInMemoryRepository()
 
     @Test
-    fun increaseMailboxScreenViewsCounterWhenRecordMailboxScreenViewIsCalled() = runTest {
+    fun `increase mailbox screen views counter when record mailbox screen view is called`() = runTest {
         // given
         check(showReviewAppRepository.screenViewCount == 0)
 
diff --git a/app/src/test/java/ch/protonmail/android/featureflags/RefreshFeatureFlagsTest.kt b/app/src/test/java/ch/protonmail/android/featureflags/RefreshFeatureFlagsTest.kt
index 5acc26158..745901951 100644
--- a/app/src/test/java/ch/protonmail/android/featureflags/RefreshFeatureFlagsTest.kt
+++ b/app/src/test/java/ch/protonmail/android/featureflags/RefreshFeatureFlagsTest.kt
@@ -50,7 +50,7 @@ class RefreshFeatureFlagsTest {
     )
 
     @Test
-    fun doesNothingWhenThereAreNoAccounts() = runTest {
+    fun `does nothing when there are no accounts`() = runTest {
         // given
         coEvery { accountManager.getAccounts() } returns flowOf()
 
@@ -62,7 +62,7 @@ class RefreshFeatureFlagsTest {
     }
 
     @Test
-    fun refreshShowRatingFeatureFlagForEachExistingUser() = runTest {
+    fun `refresh show rating feature flag for each existing user`() = runTest {
         // given
         showRatingsFlagForUserMocked(UserTestData.userId, false)
         showRatingsFlagForUserMocked(UserTestData.secondaryUserId, true)