diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index ba8c0b01b8..91ae8e235c 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -1345,7 +1345,7 @@ export class ConversationModel extends window.Backbone.Model<
       areWeAdmin: this.areWeAdmin(),
       canChangeTimer: this.canChangeTimer(),
       canEditGroupInfo: this.canEditGroupInfo(),
-      avatarPath: this.getAvatarPath()!,
+      avatarPath: this.getAbsoluteAvatarPath(),
       color,
       discoveredUnregisteredAt: this.get('discoveredUnregisteredAt'),
       draftBodyRanges,
@@ -4929,7 +4929,7 @@ export class ConversationModel extends window.Backbone.Model<
     return migrateColor(this.get('color'));
   }
 
-  getAvatarPath(): string | undefined {
+  getAbsoluteAvatarPath(): string | undefined {
     const avatar = this.isMe()
       ? this.get('profileAvatar') || this.get('avatar')
       : this.get('avatar') || this.get('profileAvatar');
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 7bd7d1a8b8..5d44d7e1b3 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -888,7 +888,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
 
     const authorColor = contactModel ? contactModel.getColor() : undefined;
     const authorAvatarPath = contactModel
-      ? contactModel.getAvatarPath()
+      ? contactModel.getAbsoluteAvatarPath()
       : undefined;
 
     const expirationLength = this.get('expireTimer') * 1000;