diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
index a2e8359284..691963f90d 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
@@ -188,13 +188,13 @@ class CallScreenPresenter @AssistedInject constructor(
                     inputs.url
                 }
                 is CallType.RoomCall -> {
-                    val (driver, url) = callWidgetProvider.getWidget(
+                    val result = callWidgetProvider.getWidget(
                         sessionId = inputs.sessionId,
                         roomId = inputs.roomId,
                         clientId = UUID.randomUUID().toString(),
                     ).getOrThrow()
-                    callWidgetDriver.value = driver
-                    url
+                    callWidgetDriver.value = result.driver
+                    result.url
                 }
             }
         }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
index 670571476c..61843c471a 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/CallWidgetProvider.kt
@@ -27,5 +27,10 @@ interface CallWidgetProvider {
         clientId: String,
         languageTag: String? = null,
         theme: String? = null,
-    ): Result<Pair<MatrixWidgetDriver, String>>
+    ): Result<GetWidgetResult>
+
+    data class GetWidgetResult(
+        val driver: MatrixWidgetDriver,
+        val url: String,
+    )
 }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
index 1daa0a8f3d..f1a71f88f5 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
@@ -24,7 +24,6 @@ import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.widget.CallWidgetSettingsProvider
-import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import kotlinx.coroutines.flow.firstOrNull
 import javax.inject.Inject
 
@@ -40,11 +39,14 @@ class DefaultCallWidgetProvider @Inject constructor(
         clientId: String,
         languageTag: String?,
         theme: String?,
-    ): Result<Pair<MatrixWidgetDriver, String>> = runCatching {
+    ): Result<CallWidgetProvider.GetWidgetResult> = runCatching {
         val room = matrixClientsProvider.getOrRestore(sessionId).getOrThrow().getRoom(roomId) ?: error("Room not found")
         val baseUrl = appPreferencesStore.getCustomElementCallBaseUrlFlow().firstOrNull() ?: ElementCallConfig.DEFAULT_BASE_URL
         val widgetSettings = callWidgetSettingsProvider.provide(baseUrl, encrypted = room.isEncrypted)
         val callUrl = room.generateWidgetWebViewUrl(widgetSettings, clientId, languageTag, theme).getOrThrow()
-        room.getWidgetDriver(widgetSettings).getOrThrow() to callUrl
+        CallWidgetProvider.GetWidgetResult(
+            driver = room.getWidgetDriver(widgetSettings).getOrThrow(),
+            url = callUrl
+        )
     }
 }
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
index b957122a3f..c085d70cb1 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
@@ -19,7 +19,6 @@ package io.element.android.features.call.utils
 import io.element.android.features.call.impl.utils.CallWidgetProvider
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 
 class FakeCallWidgetProvider(
@@ -35,8 +34,13 @@ class FakeCallWidgetProvider(
         clientId: String,
         languageTag: String?,
         theme: String?
-    ): Result<Pair<MatrixWidgetDriver, String>> {
+    ): Result<CallWidgetProvider.GetWidgetResult> {
         getWidgetCalled = true
-        return Result.success(widgetDriver to url)
+        return Result.success(
+            CallWidgetProvider.GetWidgetResult(
+                driver = widgetDriver,
+                url = url,
+            )
+        )
     }
 }