diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8385febe..c72f216b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -30,7 +30,7 @@ val material3Version = "1.4.0-alpha15"
 val androidXTestVersion = "1.6.1"
 
 object LivekitVersion {
-    val core = "2.20.3"
+    val core = "2.21.0"
     val componentsCompose = "1.4.0"
 }
 
@@ -297,9 +297,9 @@ dependencies {
     implementation("dev.snipme:highlights:1.0.0")
 
     // Livekit - Commented out for now to not inflate the app size.
-    /*implementation("io.livekit:livekit-android:${LivekitVersion.core}")
+    implementation("io.livekit:livekit-android:${LivekitVersion.core}")
     implementation("io.livekit:livekit-android-camerax:${LivekitVersion.core}")
-    implementation("io.livekit:livekit-android-compose-components:${LivekitVersion.componentsCompose}")*/
+    implementation("io.livekit:livekit-android-compose-components:${LivekitVersion.componentsCompose}")
 
     // Firebase - Cloud Messaging
     implementation(platform("com.google.firebase:firebase-bom:33.15.0"))
diff --git a/app/src/main/java/chat/stoat/composables/voice/VoiceSheet.kt b/app/src/main/java/chat/stoat/composables/voice/VoiceSheet.kt
index 5bdcc119..be78ca75 100644
--- a/app/src/main/java/chat/stoat/composables/voice/VoiceSheet.kt
+++ b/app/src/main/java/chat/stoat/composables/voice/VoiceSheet.kt
@@ -1,18 +1,31 @@
 package chat.stoat.composables.voice
 
-import android.widget.Toast
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewmodel.compose.viewModel
 import chat.stoat.R
 import chat.stoat.api.routes.misc.getRootRoute
 import chat.stoat.api.routes.voice.joinCall
+import io.livekit.android.compose.local.RoomLocal
+import io.livekit.android.compose.local.RoomScope
+import io.livekit.android.compose.state.rememberTracks
+import io.livekit.android.compose.ui.VideoTrackView
 import logcat.LogPriority
 import logcat.asLog
 import logcat.logcat
@@ -80,16 +93,7 @@ fun VoiceSheet(
         viewModel.getVoiceToken()
     }
 
-    val context = LocalContext.current
-    LaunchedEffect(Unit) {
-        Toast.makeText(
-            context,
-            "Voice chat is not available.",
-            Toast.LENGTH_SHORT
-        ).show()
-        onDisconnect()
-    }
-    /*RoomScope(
+    RoomScope(
         url = viewModel.voiceLkNode,
         token = viewModel.voiceToken,
         audio = true,
@@ -142,5 +146,5 @@ fun VoiceSheet(
                 }
             }
         }
-    }*/
+    }
 }
\ No newline at end of file