diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
index fda14f294f..a553c14952 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt
@@ -96,17 +96,19 @@ class DefaultPushHandler @Inject constructor(
                 Timber.w("Unable to get a session")
                 return
             }
-            val userPushStore = userPushStoreFactory.getOrCreate(userId)
-            val areNotificationsEnabled = userPushStore.getNotificationEnabledForDevice().first()
-            if (areNotificationsEnabled) {
-                val notifiableEvent = notifiableEventResolver.resolveEvent(userId, pushData.roomId, pushData.eventId)
-                when (notifiableEvent) {
-                    null -> Timber.tag(loggerTag.value).w("Unable to get a notification data")
-                    is NotifiableRingingCallEvent -> handleRingingCallEvent(notifiableEvent)
-                    else -> onNotifiableEventReceived.onNotifiableEventReceived(notifiableEvent)
+            val notifiableEvent = notifiableEventResolver.resolveEvent(userId, pushData.roomId, pushData.eventId)
+            when (notifiableEvent) {
+                null -> Timber.tag(loggerTag.value).w("Unable to get a notification data")
+                is NotifiableRingingCallEvent -> handleRingingCallEvent(notifiableEvent)
+                else -> {
+                    val userPushStore = userPushStoreFactory.getOrCreate(userId)
+                    val areNotificationsEnabled = userPushStore.getNotificationEnabledForDevice().first()
+                    if (areNotificationsEnabled) {
+                        onNotifiableEventReceived.onNotifiableEventReceived(notifiableEvent)
+                    } else {
+                        Timber.tag(loggerTag.value).i("Notification are disabled for this device, ignore push.")
+                    }
                 }
-            } else {
-                Timber.tag(loggerTag.value).i("Notification are disabled for this device, ignore push.")
             }
         } catch (e: Exception) {
             Timber.tag(loggerTag.value).e(e, "## handleInternal() failed")