diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index 44b2a49056e..16f878e52e2 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -34,22 +34,6 @@ export class Composer extends Component {
         return this.messaging && this.messaging.models['ComposerView'].get(this.props.localId);
     }
 
-    /**
-     * Get the current partner image URL.
-     *
-     * @returns {string}
-     */
-    get currentPartnerAvatar() {
-        const avatar = this.messaging.currentUser
-            ? this.env.session.url('/web/image', {
-                    field: 'avatar_128',
-                    id: this.messaging.currentUser.id,
-                    model: 'res.users',
-                })
-            : '/web/static/img/user_menu_avatar.png';
-        return avatar;
-    }
-
     /**
      * Determine whether composer should display a footer.
      *
diff --git a/addons/mail/static/src/components/composer/composer.xml b/addons/mail/static/src/components/composer/composer.xml
index eb75faabb68..d3114f84d2f 100644
--- a/addons/mail/static/src/components/composer/composer.xml
+++ b/addons/mail/static/src/components/composer/composer.xml
@@ -55,7 +55,7 @@
                 <t t-if="props.hasCurrentPartnerAvatar">
                     <div class="o_Composer_sidebarMain">
                         <t t-if="!messaging.currentGuest or composerView.composer.activeThread.model !== 'mail.channel'">
-                            <img class="o_Composer_currentPartnerAvatar rounded-circle" t-att-src="currentPartnerAvatar" alt="Avatar of user"/>
+                            <img class="o_Composer_currentPartnerAvatar rounded-circle" t-att-src="composerView.currentPartnerAvatar" alt="Avatar of user"/>
                         </t>
                         <t t-if="messaging.currentGuest and composerView.composer.activeThread.model === 'mail.channel'">
                             <img class="o_Composer_currentPartnerAvatar rounded-circle" t-attf-src="/mail/channel/{{ composerView.composer.activeThread.id }}/guest/{{ messaging.currentGuest.id }}/avatar_128?unique={{ messaging.currentGuest.name }}" alt="Avatar of guest"/>
diff --git a/addons/mail/static/src/models/composer_view/composer_view.js b/addons/mail/static/src/models/composer_view/composer_view.js
index cca580c206f..9512f40be5b 100644
--- a/addons/mail/static/src/models/composer_view/composer_view.js
+++ b/addons/mail/static/src/models/composer_view/composer_view.js
@@ -539,6 +539,20 @@ registerModel({
             }
             return clear();
         },
+        /**
+         * @private
+         * @returns {string}
+         */
+        _computeCurrentPartnerAvatar() {
+            if (this.messaging.currentUser) {
+                return this.env.session.url('/web/image', {
+                    field: 'avatar_128',
+                    id: this.messaging.currentUser.id,
+                    model: 'res.users',
+                });
+            }
+            return '/web/static/img/user_menu_avatar.png';
+        },
         /**
          * Clears the extra suggested record on closing mentions, and ensures
          * the extra list does not contain any element already present in the
@@ -951,6 +965,12 @@ registerModel({
             inverse: 'composerViews',
             required: true,
         }),
+        /**
+         * Current partner image URL.
+         */
+        currentPartnerAvatar: attr({
+            compute: '_computeCurrentPartnerAvatar',
+        }),
         /**
          * Determines whether this composer should be focused at next render.
          */