diff --git a/src/routes/console/project-[project]/messaging/+page.svelte b/src/routes/console/project-[project]/messaging/+page.svelte
index 54802667eb..6917880cc4 100644
--- a/src/routes/console/project-[project]/messaging/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/+page.svelte
@@ -225,19 +225,14 @@
             total={data.messages.total} />
     {:else if $hasPageQueries}
         <EmptyFilter resource="messages" />
-        <!-- TODO: remove data.search != 'empty' when the API is ready with data -->
-    {:else if data.search && data.search != 'empty'}
+    {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
                 <b>Sorry, we couldn't find '{data.search}'</b>
                 <p>There are no messages that match your search.</p>
             </div>
             <div class="u-flex u-gap-16">
-                <!-- TODO: update docs link -->
-                <Button
-                    external
-                    href="https://appwrite.io/docs/products/storage/upload-download"
-                    text>
+                <Button external href="https://appwrite.io/docs/products/messaging/messages" text>
                     Documentation
                 </Button>
                 <Button secondary href={`/console/project-${$page.params.project}/messaging`}>
@@ -246,12 +241,7 @@
             </div>
         </EmptySearch>
     {:else}
-        <!-- TODO: update docs link -->
-        <Empty
-            single
-            href="https://appwrite.io/docs"
-            target="message"
-            on:click={() => ($showCreate = true)}>
+        <Empty single target="message" on:click={() => ($showCreate = true)}>
             <div class="u-text-center">
                 <Heading size="7" tag="h2" trimmed={false}>
                     Create your first message to get started.
@@ -263,7 +253,7 @@
             <div class="u-flex u-flex-wrap u-gap-16 u-main-center">
                 <Button
                     external
-                    href="https://appwrite.io/docs/references/cloud/client-web/messages"
+                    href="https://appwrite.io/docs/products/messaging/messages"
                     text
                     event="empty_documentation"
                     ariaLabel={`create message`}>
diff --git a/src/routes/console/project-[project]/messaging/providers/+page.svelte b/src/routes/console/project-[project]/messaging/providers/+page.svelte
index 83acdb53a9..4afae7fd94 100644
--- a/src/routes/console/project-[project]/messaging/providers/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/+page.svelte
@@ -82,7 +82,6 @@
             </Button>
         </EmptySearch>
     {:else}
-        <!-- TODO: Update docs links -->
         <Empty single target="provider">
             <div class="u-text-center">
                 <Heading size="7" tag="h2" trimmed={false}>
@@ -95,7 +94,7 @@
             <div class="u-flex u-flex-wrap u-gap-16 u-main-center">
                 <Button
                     external
-                    href="https://appwrite.io/docs/references/cloud/client-web/providers"
+                    href="https://appwrite.io/docs/products/messaging/providers"
                     text
                     event="empty_documentation"
                     ariaLabel={`create provider`}>
diff --git a/src/routes/console/project-[project]/messaging/topics/+page.svelte b/src/routes/console/project-[project]/messaging/topics/+page.svelte
index 2b86aee240..4cd0959c81 100644
--- a/src/routes/console/project-[project]/messaging/topics/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/topics/+page.svelte
@@ -82,8 +82,7 @@
             total={data.topics.total} />
     {:else if $hasPageQueries}
         <EmptyFilter resource="topics" />
-        <!-- TODO: remove data.search != 'empty' when the API is ready with data -->
-    {:else if data.search && data.search != 'empty'}
+    {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
                 <b>Sorry, we couldn't find '{data.search}'</b>
@@ -94,11 +93,10 @@
             </Button>
         </EmptySearch>
     {:else}
-        <!-- TODO: update docs link -->
         <Empty
             single
             on:click={() => ($showCreate = true)}
-            href="https://appwrite.io/docs/references/cloud/client-web/teams"
+            href="https://appwrite.io/docs/products/messaging/topics"
             target="topic" />
     {/if}
 </Container>
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
index e5725ecc09..27219e4e0d 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
@@ -125,8 +125,7 @@
             total={data.subscribers.total} />
     {:else if $hasPageQueries}
         <EmptyFilter resource="subscribers" />
-        <!-- TODO: remove data.search != 'empty' when the API is ready with data -->
-    {:else if data.search && data.search != 'empty'}
+    {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
                 <b>Sorry, we couldn't find '{data.search}'</b>
@@ -139,11 +138,10 @@
             </Button>
         </EmptySearch>
     {:else}
-        <!-- TODO: update docs link -->
         <Empty
             single
             on:click={() => (showAdd = true)}
-            href="https://appwrite.io/docs/references/cloud/client-web/teams"
+            href="https://appwrite.io/docs/products/messaging/topics/#subscribe-targets-to-topics"
             target="subscriber" />
     {/if}
 </Container>
diff --git a/src/routes/console/project-[project]/messaging/topicsModal.svelte b/src/routes/console/project-[project]/messaging/topicsModal.svelte
index fb716fb17a..247dad8e14 100644
--- a/src/routes/console/project-[project]/messaging/topicsModal.svelte
+++ b/src/routes/console/project-[project]/messaging/topicsModal.svelte
@@ -121,7 +121,7 @@
                     <p>There are no topics that match your search.</p>
                 </div>
                 <div class="u-flex u-gap-16 common-section u-main-center">
-                    <Button external href="https://appwrite.io/docs/products/auth/accounts" text
+                    <Button external href="https://appwrite.io/docs/products/messaging/topics" text
                         >Documentation</Button>
                     <Button secondary on:click={() => (search = '')}>Clear search</Button>
                 </div>
@@ -134,10 +134,9 @@
                     <p class="text u-line-height-1-5">
                         You have no topics. Create a topic to see them here.
                     </p>
-                    <!-- TODO: link to topics docs -->
                     <p class="text u-line-height-1-5">
                         Need a hand? Learn more in our <a
-                            href="https://appwrite.io/docs/products/auth/quick-start"
+                            href="https://appwrite.io/docs/products/messaging/topics"
                             target="_blank"
                             rel="noopener noreferrer">
                             documentation</a
diff --git a/src/routes/console/project-[project]/messaging/wizard/step1.svelte b/src/routes/console/project-[project]/messaging/wizard/step1.svelte
index a7df944958..d29471b396 100644
--- a/src/routes/console/project-[project]/messaging/wizard/step1.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/step1.svelte
@@ -6,6 +6,9 @@
     import SmsFormList from './smsFormList.svelte';
     import PushFormList, { validateData } from './pushFormList.svelte';
     import { MessagingProviderType } from '@appwrite.io/console';
+    import { Button } from '$lib/elements/forms';
+
+    let docsUrl = `https://appwrite.io/docs/products/messaging`;
 
     async function beforeSubmit() {}
 
@@ -17,8 +20,20 @@
         article = lastLetter === 's' ? '' : article;
 
         providerText = providerText.toLowerCase() === 'sms' ? 'SMS messages' : providerText;
-        return `Create ${article} ${providerText} that will be displayed to your subscribers. Learn more in our documentation.`;
+        return `Create ${article} ${providerText} that will be displayed to your subscribers.`;
     };
+
+    switch ($providerType) {
+        case MessagingProviderType.Email:
+            docsUrl += '/send-email-messages';
+            break;
+        case MessagingProviderType.Sms:
+            docsUrl += '/send-sms-messages';
+            break;
+        case MessagingProviderType.Push:
+            docsUrl += '/send-push-notifications';
+            break;
+    }
 </script>
 
 <WizardStep
@@ -27,8 +42,12 @@
         !!validateData($messageParams[MessagingProviderType.Push].data)}>
     <svelte:fragment slot="title">Message</svelte:fragment>
     <svelte:fragment slot="subtitle">
-        <!-- TODO: update documentation link -->
-        {createMessage(providers[$providerType].text)}
+        {createMessage(providers[$providerType].text)} Learn more in our <Button
+            link
+            external
+            text
+            href={docsUrl}>documentation</Button
+        >.
     </svelte:fragment>
     {#if $providerType === MessagingProviderType.Email}
         <EmailFormList />
diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
index fce6731eeb..ae34b67651 100644
--- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import { FormList, InputDate, InputSelect, InputTime } from '$lib/elements/forms';
+    import { Button, FormList, InputDate, InputSelect, InputTime } from '$lib/elements/forms';
     import Helper from '$lib/elements/forms/helper.svelte';
     import { WizardStep } from '$lib/layout';
-    import { MessageType } from '@appwrite.io/console';
+    import { MessageType, MessagingProviderType } from '@appwrite.io/console';
     import { messageParams, providerType } from './store';
 
     let when: 'now' | 'later' = 'now';
@@ -12,6 +12,19 @@
     let date: string;
     let time: string;
     let dateTime: Date;
+    let docsUrl = `https://appwrite.io/docs/products/messaging`;
+
+    switch ($providerType) {
+        case MessagingProviderType.Email:
+            docsUrl += '/send-email-messages';
+            break;
+        case MessagingProviderType.Sms:
+            docsUrl += '/send-sms-messages';
+            break;
+        case MessagingProviderType.Push:
+            docsUrl += '/send-push-notifications';
+            break;
+    }
 
     const options = [
         { label: 'Now', value: 'now' },
@@ -52,9 +65,13 @@
 
 <WizardStep {beforeSubmit}>
     <svelte:fragment slot="title">Schedule</svelte:fragment>
-    <!-- TODO: Add link to docs -->
     <svelte:fragment slot="subtitle"
-        >Schedule the time you want to deliver this message. Learn more in our documentation.</svelte:fragment>
+        >Schedule the time you want to deliver this message. Learn more in our <Button
+            link
+            external
+            text
+            href={docsUrl}>documentation</Button
+        >.</svelte:fragment>
     <FormList>
         <div
             class="u-grid u-gap-24"