diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/ComposeSubscriptionManager.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/ComposeSubscriptionManager.kt
index b7787ff5c..926ed9c99 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/ComposeSubscriptionManager.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/ComposeSubscriptionManager.kt
@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers
 
+import androidx.compose.runtime.Stable
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.collections.forEach
 
@@ -28,6 +29,7 @@ import kotlin.collections.forEach
  *  to relays. There may be multiple duplications in these
  *  subscriptions since we do not control when screens are removed.
  */
+@Stable
 abstract class ComposeSubscriptionManager<T> :
     ComposeSubscriptionManagerControls,
     Subscribable<T> {
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/MutableComposeSubscriptionManager.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/MutableComposeSubscriptionManager.kt
index eff5f8909..da8e82276 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/MutableComposeSubscriptionManager.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/relayClient/composeSubscriptionManagers/MutableComposeSubscriptionManager.kt
@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.commons.relayClient.composeSubscriptionManagers
 
+import androidx.compose.runtime.Stable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
@@ -36,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap
  *  also allows the subscription itself to change over time as a
  *  flow, which trigger an update on the relay subscriptions
  */
+@Stable
 abstract class MutableComposeSubscriptionManager<T : MutableQueryState>(
     val scope: CoroutineScope,
 ) : ComposeSubscriptionManagerControls {