diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
index e161be392..f28571682 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
@@ -62,7 +62,10 @@ class TorService(
                                 delay(100)
                             }
 
-                            trySend(TorServiceStatus.Active(torService.socksPort, torService.torControlConnection))
+                            val active = TorServiceStatus.Active(torService.socksPort)
+                            active.torControlConnection = torService.torControlConnection
+
+                            trySend(active)
                             Log.d("TorService", "Tor Service Connected ${torService.socksPort}")
                         }
                     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorServiceStatus.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorServiceStatus.kt
index 98269d3dc..f0bd812a8 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorServiceStatus.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorServiceStatus.kt
@@ -25,8 +25,9 @@ import net.freehaven.tor.control.TorControlConnection
 sealed class TorServiceStatus {
     data class Active(
         val port: Int,
-        val torControlConnection: TorControlConnection,
-    ) : TorServiceStatus()
+    ) : TorServiceStatus() {
+        lateinit var torControlConnection: TorControlConnection
+    }
 
     object Off : TorServiceStatus()