diff --git a/addons/mail/static/src/component_hooks/use_refs/use_refs.js b/addons/mail/static/src/component_hooks/use_refs/use_refs.js
index 6ecfd2b4ba3..e00d670473a 100644
--- a/addons/mail/static/src/component_hooks/use_refs/use_refs.js
+++ b/addons/mail/static/src/component_hooks/use_refs/use_refs.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-const { Component } = owl;
+const { useComponent } = owl;
 
 /**
  * This hook provides support for dynamic-refs.
@@ -9,7 +9,7 @@ const { Component } = owl;
  *   and values are refs.
  */
 export function useRefs() {
-    const component = Component.current;
+    const component = useComponent();
     return function () {
         return component.__owl__.refs || {};
     };
diff --git a/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js b/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js
index ac305e0aa1c..b32a8556427 100644
--- a/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js
+++ b/addons/mail/static/src/component_hooks/use_rendered_values/use_rendered_values.js
@@ -2,7 +2,7 @@
 
 import { Listener } from '@mail/model/model_listener';
 
-const { Component, onMounted, onPatched } = owl;
+const { onMounted, onPatched, useComponent } = owl;
 
 /**
  * This hooks provides support for accessing the values returned by the given
@@ -14,7 +14,7 @@ const { Component, onMounted, onPatched } = owl;
  * @returns {function} function to call to retrieve the last rendered values.
  */
 export function useRenderedValues(selector) {
-    const component = Component.current;
+    const component = useComponent();
     let renderedValues;
     let patchedValues;
     const { modelManager } = component.env.services.messaging;
diff --git a/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js b/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js
index 316f433d026..90add18a6fa 100644
--- a/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js
+++ b/addons/mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js
@@ -1,7 +1,6 @@
 /** @odoo-module **/
-'use strict';
 
-const { Component, onPatched } = owl;
+const { onPatched, useComponent } = owl;
 
 /**
  * Shallow compares props `a` and `b`.
@@ -30,7 +29,7 @@ function isEqual(a, b) {
  * comparing props.
  */
 export function useShouldUpdateBasedOnProps() {
-    const component = Component.current;
+    const component = useComponent();
     let forceRender = false;
     component.shouldUpdate = nextProps => {
         if (forceRender) {