diff --git a/src/addon/messages/providers/settings-handler.ts b/src/addon/messages/providers/settings-handler.ts
index b3a4b62df..cbee96b44 100644
--- a/src/addon/messages/providers/settings-handler.ts
+++ b/src/addon/messages/providers/settings-handler.ts
@@ -32,8 +32,10 @@ export class AddonMessagesSettingsHandler implements CoreSettingsHandler {
      *
      * @return Whether or not the handler is enabled on a site level.
      */
-    isEnabled(): boolean | Promise<boolean> {
-        return this.messagesProvider.isMessagePreferencesEnabled();
+    async isEnabled(): Promise<boolean> {
+        const messagingEnabled = await this.messagesProvider.isPluginEnabled();
+
+        return messagingEnabled && this.messagesProvider.isMessagePreferencesEnabled();
     }
 
     /**