diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt
index c75cc6f76b..e8058eab3f 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/PushersManager.kt
@@ -44,14 +44,14 @@ class PushersManager @Inject constructor(
         )
     }
 
-    fun enqueueRegisterPusherWithFcmKey(pushKey: String): UUID {
+    fun enqueueRegisterPusherWithFcmKey(pushKey: String)/*: UUID*/ {
         return enqueueRegisterPusher(pushKey, PushConfig.pusher_http_url)
     }
 
     fun enqueueRegisterPusher(
         pushKey: String,
         gateway: String
-    ): UUID {
+    ) /*: UUID*/ {
         /*
         val currentSession = activeSessionHolder.getActiveSession()
         val pusher = createHttpPusher(pushKey, gateway)
@@ -59,7 +59,10 @@ class PushersManager @Inject constructor(
 
          */
         // TODO EAx
-        TODO()
+        // TODO()
+        // Get all sessions
+        // Register pusher
+        // Close sessions
     }
 
     private fun createHttpPusher(
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorFirebaseMessagingService.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorFirebaseMessagingService.kt
index 09dbf28a33..e9bccf7cdd 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorFirebaseMessagingService.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorFirebaseMessagingService.kt
@@ -47,7 +47,7 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
         Timber.tag(loggerTag.value).d("New Firebase token")
         fcmHelper.storeFcmToken(token)
         if (
-            pushDataStore.areNotificationEnabledForDevice() &&
+            // pushDataStore.areNotificationEnabledForDevice() &&
             // TODO EAx activeSessionHolder.hasActiveSession() &&
             unifiedPushHelper.isEmbeddedDistributor()
         ) {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorPushHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorPushHandler.kt
index 9fad5a37bc..6a73cedf92 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorPushHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/VectorPushHandler.kt
@@ -114,6 +114,10 @@ class VectorPushHandler @Inject constructor(
             }
 
             /* TODO EAx
+            - Open session
+            - get the event
+            - display the notif
+
             val session = activeSessionHolder.getOrInitializeSession()
 
             if (session == null) {
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/model/PushData.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/model/PushData.kt
index 9a91f1f1ac..75bed1027b 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/model/PushData.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/model/PushData.kt
@@ -27,4 +27,6 @@ data class PushData(
         val eventId: String?,
         val roomId: String?,
         val unread: Int?,
+
+        // TODO EAx Client secret
 )