diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index f2ac04e0e6..ddc7789302 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -80,7 +80,7 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
-import io.element.android.libraries.ui.common.nodes.LoadingNode
+import io.element.android.libraries.ui.common.nodes.loadingNode
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
@@ -281,7 +281,7 @@ class LoggedInFlowNode(
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
-            NavTarget.Placeholder -> createNode<LoadingNode>(buildContext)
+            NavTarget.Placeholder -> loadingNode(buildContext)
             NavTarget.LoggedInPermanent -> {
                 val callback = object : LoggedInNode.Callback {
                     override fun navigateToNotificationTroubleshoot() {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
index 8f96a29806..dbd6e146f0 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -56,7 +56,7 @@ import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcActionFlow
 import io.element.android.libraries.sessionstorage.api.LoggedInState
 import io.element.android.libraries.sessionstorage.api.SessionStore
-import io.element.android.libraries.ui.common.nodes.LoadingNode
+import io.element.android.libraries.ui.common.nodes.loadingNode
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -216,7 +216,7 @@ import timber.log.Timber
         return when (navTarget) {
             is NavTarget.LoggedInFlow -> {
                 val matrixClient = matrixSessionCache.getOrNull(navTarget.sessionId)
-                    ?: return createNode<LoadingNode>(buildContext).also {
+                    ?: return loadingNode(buildContext).also {
                         Timber.w("Couldn't find any session, go through SplashScreen")
                     }
                 val inputs = LoggedInAppScopeFlowNode.Inputs(matrixClient)
@@ -249,7 +249,7 @@ import timber.log.Timber
                     )
                 ).build()
             }
-            NavTarget.SplashScreen -> createNode<LoadingNode>(buildContext)
+            NavTarget.SplashScreen -> loadingNode(buildContext)
             NavTarget.BugReport -> {
                 val callback = object : BugReportEntryPoint.Callback {
                     override fun onDone() {
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
index d1bfa86a58..3cc0de7438 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
@@ -31,7 +31,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.ui.common.nodes.LoadingNode
+import io.element.android.libraries.ui.common.nodes.loadingNode
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -83,7 +83,7 @@ class FtueFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Placeholder -> {
-                createNode<LoadingNode>(buildContext)
+                loadingNode(buildContext)
             }
             is NavTarget.SessionVerification -> {
                 val callback = object : FtueSessionVerificationFlowNode.Callback {
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
index 71fc2cb502..4f335a3b97 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
@@ -29,7 +29,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.ui.common.nodes.LoadingNode
+import io.element.android.libraries.ui.common.nodes.loadingNode
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
@@ -95,7 +95,7 @@ class LockScreenSettingsFlowNode(
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
         return when (navTarget) {
             NavTarget.Loading -> {
-                createNode<LoadingNode>(buildContext)
+                loadingNode(buildContext)
             }
             NavTarget.Unlock -> {
                 val callback = object : PinUnlockNode.Callback {
diff --git a/libraries/ui-common/build.gradle.kts b/libraries/ui-common/build.gradle.kts
index b8fbc2047e..55ef7eaf49 100644
--- a/libraries/ui-common/build.gradle.kts
+++ b/libraries/ui-common/build.gradle.kts
@@ -1,5 +1,3 @@
-import extension.setupDependencyInjection
-
 /*
  * Copyright 2025 New Vector Ltd.
  *
@@ -15,10 +13,7 @@ android {
     namespace = "io.element.android.libraries.ui.common"
 }
 
-setupDependencyInjection()
-
 dependencies {
-    implementation(projects.libraries.architecture)
+    implementation(libs.appyx.core)
     implementation(projects.libraries.designsystem)
-    implementation(projects.libraries.di)
 }
diff --git a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/LoadingNode.kt b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/LoadingNode.kt
index cd078fbb0e..e9a33049d7 100644
--- a/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/LoadingNode.kt
+++ b/libraries/ui-common/src/main/kotlin/io/element/android/libraries/ui/common/nodes/LoadingNode.kt
@@ -9,28 +9,14 @@ package io.element.android.libraries.ui.common.nodes
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
-import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.Assisted
-import dev.zacsweers.metro.AssistedInject
-import io.element.android.annotations.ContributesNode
+import com.bumble.appyx.core.node.node
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 
-@ContributesNode(AppScope::class)
-@AssistedInject
-class LoadingNode(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-) : Node(buildContext, plugins = plugins) {
-    @Composable
-    override fun View(modifier: Modifier) {
-        Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-            CircularProgressIndicator()
-        }
+fun loadingNode(buildContext: BuildContext): Node = node(buildContext) { modifier ->
+    Box(modifier = modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+        CircularProgressIndicator()
     }
 }