diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupChatMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupChatMessage.ts
index a0f75f4b0..4bdc144e8 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupChatMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupChatMessage.ts
@@ -25,8 +25,12 @@ export class ClosedGroupChatMessage extends ClosedGroupMessage {
     return this.getDefaultTTL();
   }
 
-  protected groupContextType(): SignalService.GroupContext.Type {
-    return SignalService.GroupContext.Type.DELIVER;
+  protected groupContext(): SignalService.GroupContext {
+    // use the parent method to fill id correctly
+    const groupContext = super.groupContext();
+    groupContext.type = SignalService.GroupContext.Type.DELIVER;
+
+    return groupContext;
   }
 
   protected dataProto(): SignalService.DataMessage {
diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupLeaveMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupLeaveMessage.ts
index 29622a13e..1db46ea83 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupLeaveMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupLeaveMessage.ts
@@ -13,7 +13,12 @@ export class ClosedGroupLeaveMessage extends ClosedGroupMessage {
     });
   }
 
-  protected groupContextType(): SignalService.GroupContext.Type {
-    return SignalService.GroupContext.Type.QUIT;
+  protected groupContext(): SignalService.GroupContext {
+    // use the parent method to fill id correctly
+    const groupContext = super.groupContext();
+
+    groupContext.type = SignalService.GroupContext.Type.QUIT;
+
+    return groupContext;
   }
 }
diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts
index 91bb9a874..7586cc3ab 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts
@@ -23,13 +23,10 @@ export abstract class ClosedGroupMessage extends DataMessage {
     return this.getDefaultTTL();
   }
 
-  protected abstract groupContextType(): SignalService.GroupContext.Type;
-
   protected groupContext(): SignalService.GroupContext {
     const id = new Uint8Array(StringUtils.encode(this.groupId.key, 'utf8'));
-    const type = this.groupContextType();
 
-    return new SignalService.GroupContext({ id, type });
+    return new SignalService.GroupContext({ id });
   }
 
   protected dataProto(): SignalService.DataMessage {
diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupRequestInfoMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupRequestInfoMessage.ts
index 43a9cad0b..ac8beb3a5 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupRequestInfoMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupRequestInfoMessage.ts
@@ -13,7 +13,11 @@ export class ClosedGroupRequestInfoMessage extends ClosedGroupMessage {
     });
   }
 
-  protected groupContextType(): SignalService.GroupContext.Type {
-    return SignalService.GroupContext.Type.REQUEST_INFO;
+  protected groupContext(): SignalService.GroupContext {
+    // use the parent method to fill id correctly
+    const groupContext = super.groupContext();
+    groupContext.type = SignalService.GroupContext.Type.REQUEST_INFO;
+
+    return groupContext;
   }
 }
diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
index e416394fc..3c4aa14c0 100644
--- a/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
+++ b/ts/session/messages/outgoing/content/data/group/ClosedGroupUpdateMessage.ts
@@ -52,14 +52,12 @@ export abstract class ClosedGroupUpdateMessage extends ClosedGroupMessage {
     this.avatar = params.avatar;
   }
 
-  protected groupContextType(): SignalService.GroupContext.Type {
-    return SignalService.GroupContext.Type.UPDATE;
-  }
-
   protected groupContext(): SignalService.GroupContext {
-    // use the parent method to fill id and type correctly
+    // use the parent method to fill id correctly
     const groupContext = super.groupContext();
 
+    groupContext.type = SignalService.GroupContext.Type.UPDATE;
+
     if (this.name) {
       groupContext.name = this.name;
     }