diff --git a/jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt b/jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
index f450a37caba67b014adb6d9e1c80b0a7509dc12f..f16c86bba62b61169b1587c6f806a4d01227ef17 100644
--- a/jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
@@ -885,29 +885,32 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
 
         if(callMediaHandlers == null) callMediaHandlers = PluginUtils.getInstalledPlugins(binding.pluginslistContainer.context)
         pluginsAdapter = PluginsAdapter(
-            callMediaHandlers!!,
-            object : PluginsAdapter.PluginListItemListener {
-                override fun onPluginItemClicked(pluginDetails: PluginDetails) {
-                }
+            mList = callMediaHandlers!!,
+            listener = object : PluginsAdapter.PluginListItemListener {
+                override fun onPluginItemClicked(pluginDetails: PluginDetails) {}
+
                 override fun onPluginEnabled(pluginDetails: PluginDetails) {
                     pluginDetails.isRunning = !pluginDetails.isRunning
-                    if(!isChoosePluginMode) {
+                    if (!isChoosePluginMode) {
                         presenter.startPlugin(pluginDetails.handlerId!!)
                         isChoosePluginMode = true
                     } else {
                         if (pluginDetails.isRunning) {
                             presenter.toggleCallMediaHandler(pluginDetails.handlerId!!, true)
-                        }
-                        else {
+                        } else {
                             presenter.toggleCallMediaHandler(pluginDetails.handlerId!!, false)
-                            for(handler in callMediaHandlers!!) if (handler.isRunning) break else {
-                                presenter.stopPlugin()
-                                isChoosePluginMode = false
-                            }
+                            for (handler in callMediaHandlers!!)
+                                if (handler.isRunning) break
+                                else {
+                                    presenter.stopPlugin()
+                                    isChoosePluginMode = false
+                                }
                         }
                     }
                 }
-            }, participantInfo[0].call?.account)
+            },
+            accountId = if (participantInfo.isNotEmpty()) participantInfo[0].call?.account else null
+        )
         binding.pluginslistContainer.adapter = pluginsAdapter
     }