diff --git a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
index bb33dadfa4..3bdec33859 100644
--- a/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
+++ b/libraries/pushproviders/unifiedpush/src/main/kotlin/io/element/android/libraries/pushproviders/unifiedpush/UnregisterUnifiedPushUseCase.kt
@@ -33,15 +33,18 @@ class DefaultUnregisterUnifiedPushUseCase @Inject constructor(
         if (endpoint == null || gateway == null) {
             Timber.w("No endpoint or gateway found for client secret")
             // Ensure we don't have any remaining data, but ignore this error
-            unifiedPushStore.storeUpEndpoint(clientSecret, null)
-            unifiedPushStore.storePushGateway(clientSecret, null)
+            cleanup(clientSecret)
             return Result.success(Unit)
         }
         return pusherSubscriber.unregisterPusher(matrixClient, endpoint, gateway)
             .onSuccess {
-                unifiedPushStore.storeUpEndpoint(clientSecret, null)
-                unifiedPushStore.storePushGateway(clientSecret, null)
-                UnifiedPush.unregisterApp(context, clientSecret)
+                cleanup(clientSecret)
             }
     }
+
+    private fun cleanup(clientSecret: String) {
+        unifiedPushStore.storeUpEndpoint(clientSecret, null)
+        unifiedPushStore.storePushGateway(clientSecret, null)
+        UnifiedPush.unregisterApp(context, clientSecret)
+    }
 }