diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
index 9ddc5080f..1c04e8e78 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
@@ -23,6 +23,7 @@ package com.nextcloud.talk.models.json.websocket;
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;
 import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
+import com.nextcloud.talk.models.json.signaling.NCSignalingMessage;
 
 import org.parceler.Parcel;
 
@@ -36,5 +37,5 @@ public class CallWebSocketMessage {
     RecipientWebSocketMessage recipientWebSocketMessage;
 
     @JsonField(name = "data")
-    NCMessageWrapper ncMessageWrapper;
+    NCSignalingMessage ncSignalingMessage;
 }
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
index ea8c52fad..68e9f824b 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
@@ -109,7 +109,7 @@ public class WebSocketConnectionHelper {
         return helloOverallWebSocketMessage;
     }
 
-    public RoomOverallWebSocketMessage getAssembledJoinOrLeaveRoomModel(String roomId, String sessionId) {
+    RoomOverallWebSocketMessage getAssembledJoinOrLeaveRoomModel(String roomId, String sessionId) {
         RoomOverallWebSocketMessage roomOverallWebSocketMessage = new RoomOverallWebSocketMessage();
         roomOverallWebSocketMessage.setType("room");
         RoomWebSocketMessage roomWebSocketMessage = new RoomWebSocketMessage();
@@ -119,7 +119,7 @@ public class WebSocketConnectionHelper {
         return roomOverallWebSocketMessage;
     }
 
-    public RequestOfferOverallWebSocketMessage getAssembledRequestOfferModel(String sessionId, String roomType) {
+    RequestOfferOverallWebSocketMessage getAssembledRequestOfferModel(String sessionId, String roomType) {
         RequestOfferOverallWebSocketMessage requestOfferOverallWebSocketMessage = new RequestOfferOverallWebSocketMessage();
         requestOfferOverallWebSocketMessage.setType("message");
 
@@ -139,7 +139,7 @@ public class WebSocketConnectionHelper {
         return requestOfferOverallWebSocketMessage;
     }
 
-    public CallOverallWebSocketMessage getAssembledCallMessageModel(NCMessageWrapper ncMessageWrapper) {
+    CallOverallWebSocketMessage getAssembledCallMessageModel(NCMessageWrapper ncMessageWrapper) {
         CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage();
         callOverallWebSocketMessage.setType("message");
 
@@ -149,7 +149,7 @@ public class WebSocketConnectionHelper {
         recipientWebSocketMessage.setType("session");
         recipientWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo());
         callWebSocketMessage.setRecipientWebSocketMessage(recipientWebSocketMessage);
-        callWebSocketMessage.setNcMessageWrapper(ncMessageWrapper);
+        callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage());
 
         callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage);
         return callOverallWebSocketMessage;