diff --git a/ts/session/messages/outgoing/content/TypingMessage.ts b/ts/session/messages/outgoing/content/TypingMessage.ts
index 5a220eb61..c9da65401 100644
--- a/ts/session/messages/outgoing/content/TypingMessage.ts
+++ b/ts/session/messages/outgoing/content/TypingMessage.ts
@@ -5,14 +5,14 @@ import { MessageParams } from '../Message';
 
 interface TypingMessageParams extends MessageParams {
   isTyping: boolean;
-  typingTimestamp: number | null;
-  groupId: string | null;
+  typingTimestamp?: number;
+  groupId?: string;
 }
 
 export class TypingMessage extends ContentMessage {
   private readonly isTyping: boolean;
-  private readonly typingTimestamp: number | null;
-  private readonly groupId: string | null;
+  private readonly typingTimestamp?: number;
+  private readonly groupId?: string;
 
   constructor(params: TypingMessageParams) {
     super({timestamp: params.timestamp, identifier: params.identifier});
diff --git a/ts/session/messages/outgoing/content/link/DeviceLinkGrantMessage.ts b/ts/session/messages/outgoing/content/link/DeviceLinkGrantMessage.ts
index e1acaef73..78a936e59 100644
--- a/ts/session/messages/outgoing/content/link/DeviceLinkGrantMessage.ts
+++ b/ts/session/messages/outgoing/content/link/DeviceLinkGrantMessage.ts
@@ -11,7 +11,7 @@ export class DeviceLinkGrantMessage extends DeviceLinkRequestMessage {
   private readonly displayName: string;
   private readonly avatarPointer: string;
   private readonly profileKey: Uint8Array;
-  private readonly grantSignature: Uint8Array | null;
+  private readonly grantSignature: Uint8Array;
 
   constructor(params: DeviceLinkGrantMessageParams
   ) {
@@ -38,7 +38,7 @@ export class DeviceLinkGrantMessage extends DeviceLinkRequestMessage {
     });
   }
 
-  protected getDataMessage(): SignalService.DataMessage | null {
+  protected getDataMessage(): SignalService.DataMessage | undefined {
     // Send profile name to secondary device and avatarPointer
     const profile = new SignalService.DataMessage.LokiProfile();
     profile.avatar = this.avatarPointer;
diff --git a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
index 56b95e514..3c9c43d5d 100644
--- a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
+++ b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
@@ -24,8 +24,8 @@ export class DeviceLinkRequestMessage extends ContentMessage {
     return 2 * 60 * 1000; // 2 minutes for pairing requests
   }
 
-  protected getDataMessage(): SignalService.DataMessage | null {
-    return null;
+  protected getDataMessage(): SignalService.DataMessage | undefined {
+    return undefined;
   }
 
   protected getPairingAuthorisationMessage(): SignalService.PairingAuthorisationMessage {
@@ -40,7 +40,7 @@ export class DeviceLinkRequestMessage extends ContentMessage {
   protected contentProto(): SignalService.Content {
     return new SignalService.Content({
       pairingAuthorisation: this.getPairingAuthorisationMessage(),
-      dataMessage: this.getDataMessage() || null,
+      dataMessage: this.getDataMessage(),
     });
   }
 }
diff --git a/ts/test/session/messages/TypingMessage_test.ts b/ts/test/session/messages/TypingMessage_test.ts
index 58c9dbb27..c4fcede99 100644
--- a/ts/test/session/messages/TypingMessage_test.ts
+++ b/ts/test/session/messages/TypingMessage_test.ts
@@ -10,8 +10,6 @@ describe('TypingMessage', () => {
             timestamp: Date.now(),
             identifier: '123456',
             isTyping: true,
-            typingTimestamp: null,
-            groupId: null,
         });
         const plainText = message.plainTextBuffer();
         const decoded = SignalService.Content.toObject(SignalService.Content.decode(plainText));
@@ -23,8 +21,6 @@ describe('TypingMessage', () => {
             timestamp: Date.now(),
             identifier: '123456',
             isTyping: false,
-            typingTimestamp: null,
-            groupId: null,
         });
         const plainText = message.plainTextBuffer();
         const decoded = SignalService.Content.toObject(SignalService.Content.decode(plainText));
@@ -37,7 +33,6 @@ describe('TypingMessage', () => {
             identifier: '123456',
             isTyping: true,
             typingTimestamp: 111111111,
-            groupId: null,
         });
         const plainText = message.plainTextBuffer();
         const decoded = SignalService.Content.toObject(SignalService.Content.decode(plainText));
@@ -50,8 +45,6 @@ describe('TypingMessage', () => {
             timestamp: Date.now(),
             identifier: '123456',
             isTyping: true,
-            typingTimestamp: null,
-            groupId: null,
         });
         const plainText = message.plainTextBuffer();
         const decoded = SignalService.Content.toObject(SignalService.Content.decode(plainText));
@@ -65,7 +58,6 @@ describe('TypingMessage', () => {
             timestamp: Date.now(),
             identifier: '123456',
             isTyping: true,
-            typingTimestamp: null,
             groupId,
         });
         const plainText = message.plainTextBuffer();
@@ -80,8 +72,6 @@ describe('TypingMessage', () => {
             timestamp: Date.now(),
             identifier: '123456',
             isTyping: true,
-            typingTimestamp: null,
-            groupId: null,
         });
         expect(message.ttl()).to.equal(60 * 1000);
     });