diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.kt b/app/src/main/java/com/nextcloud/talk/controllers/CallController.kt
index f01a0b601..b77ac9e95 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.kt
@@ -1982,12 +1982,9 @@ class CallController(args: Bundle) : BaseController() {
         val relativeLayout =
                 remoteRenderersLayout!!.findViewWithTag<RelativeLayout>("$session+$videoStreamType")
         val surfaceViewRenderer = relativeLayout.findViewById<SurfaceViewRenderer>(R.id.surface_view)
-        val imageView = relativeLayout.findViewById<SimpleDraweeView>(R.id.avatarImageView)
+        val imageView = relativeLayout.findViewById(R.id.avatarImageView) as ImageView
 
-        if (mediaStream != null
-                && mediaStream.videoTracks != null
-                && mediaStream.videoTracks.size > 0
-                && enable
+        if (!(mediaStream?.videoTracks == null || mediaStream.videoTracks.size <= 0 || !enable)
         ) {
             val videoTrack = mediaStream.videoTracks[0]
 
diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml
index 0fca176a1..d8064828c 100644
--- a/app/src/main/res/layout/call_item.xml
+++ b/app/src/main/res/layout/call_item.xml
@@ -19,13 +19,24 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/relative_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_weight="1"
     android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/avatarImageView"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_centerInParent="true" />
+
+    <org.webrtc.SurfaceViewRenderer
+        android:id="@+id/surface_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible" />
+
     <ImageView
         android:id="@+id/remote_audio_off"
         android:layout_width="16dp"
@@ -58,16 +69,4 @@
         android:layout_marginBottom="8dp"
         android:textColor="@android:color/white" />
 
-    <ImageView
-        android:id="@+id/avatarImageView"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_centerInParent="true" />
-
-    <org.webrtc.SurfaceViewRenderer
-        android:id="@+id/surface_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible" />
-
 </RelativeLayout>