diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index c24adfda5..cabc41d2f 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -36,6 +36,8 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.nextcloud.talk.R;
@@ -128,7 +130,6 @@ public class CallActivity extends AppCompatActivity {
     AudioTrack localAudioTrack;
     VideoCapturer videoCapturer;
     VideoRenderer localRenderer;
-    HashMap<String, VideoRenderer> videoRendererHashMap = new HashMap<>();
     EglBase rootEglBase;
     boolean leavingCall = false;
     BooleanSupplier booleanSupplier = () -> leavingCall;
@@ -565,8 +566,13 @@ public class CallActivity extends AppCompatActivity {
             videoCapturer.dispose();
         }
 
-        localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
-        localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
+        if (localMediaStream.videoTracks.size() > 0) {
+            localMediaStream.removeTrack(localMediaStream.videoTracks.get(0));
+        }
+
+        if (localMediaStream.audioTracks.size() > 0) {
+            localMediaStream.removeTrack(localMediaStream.audioTracks.get(0));
+        }
         localMediaStream = null;
 
         pipVideoView.release();
@@ -622,6 +628,14 @@ public class CallActivity extends AppCompatActivity {
                 });
     }
 
+    private void gotNick(String sessionId, String nick) {
+        RelativeLayout relativeLayout = remoteRenderersLayout.findViewWithTag(sessionId);
+        if (relativeLayout != null) {
+            TextView textView = relativeLayout.findViewById(R.id.peer_nick_text_view);
+            textView.setText(nick);
+        }
+    }
+
     private void gotRemoteStream(MediaStream stream, String session) {
         //we have remote video stream. add to the renderer.
         removeMediaStream(session);
@@ -634,11 +648,11 @@ public class CallActivity extends AppCompatActivity {
                     public void run() {
                         if (stream.videoTracks.size() == 1) {
                             try {
-                                LinearLayout linearLayout = (LinearLayout)
+                                RelativeLayout relativeLayout = (RelativeLayout)
                                         getLayoutInflater().inflate(R.layout.surface_renderer, remoteRenderersLayout,
                                                 false);
-                                linearLayout.setTag(session);
-                                SurfaceViewRenderer surfaceViewRenderer = linearLayout.findViewById(R.id
+                                relativeLayout.setTag(session);
+                                SurfaceViewRenderer surfaceViewRenderer = relativeLayout.findViewById(R.id
                                         .surface_view);
                                 surfaceViewRenderer.setMirror(false);
                                 surfaceViewRenderer.init(rootEglBase.getEglBaseContext(), null);
@@ -646,10 +660,10 @@ public class CallActivity extends AppCompatActivity {
                                 surfaceViewRenderer.setEnableHardwareScaler(true);
                                 surfaceViewRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
                                 VideoRenderer remoteRenderer = new VideoRenderer(surfaceViewRenderer);
-                                videoRendererHashMap.put(session, remoteRenderer);
                                 videoTrack.addRenderer(remoteRenderer);
-                                remoteRenderersLayout.addView(linearLayout);
-                                linearLayout.invalidate();
+                                remoteRenderersLayout.addView(relativeLayout);
+                                relativeLayout.invalidate();
+                                gotNick(session, getPeerConnectionWrapperForSessionId(session).getNick());
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -816,7 +830,7 @@ public class CallActivity extends AppCompatActivity {
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
-        
+
         // Checks the orientation of the screen
         if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
             remoteRenderersLayout.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
index 9a75898f3..5bbf41333 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -52,7 +52,7 @@ public class MagicPeerConnectionWrapper {
     private List<PeerConnection.IceServer> iceServers;
     private String sessionId;
     private String localSession;
-    private String nick;
+    private String nick = "";
     private MediaConstraints mediaConstraints;
     private DataChannel magicDataChannel;
     private MagicSdpObserver magicSdpObserver;
diff --git a/app/src/main/res/layout/surface_renderer.xml b/app/src/main/res/layout/surface_renderer.xml
index d2034ace0..52cd7cb1a 100644
--- a/app/src/main/res/layout/surface_renderer.xml
+++ b/app/src/main/res/layout/surface_renderer.xml
@@ -19,16 +19,26 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                android:id="@+id/relative_layout"
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/relative_layout"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_weight="1"
+              android:orientation="vertical">
 
-    <org.webrtc.SurfaceViewRenderer
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/surface_view"/>
+        <org.webrtc.SurfaceViewRenderer
+            android:id="@+id/surface_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:id="@+id/peer_nick_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentStart="true"
+            android:layout_margin="8dp"
+            android:textColor="@color/nc_white_color_complete"
+            android:visibility="visible"/>
+
+</RelativeLayout>
\ No newline at end of file