diff --git a/src/app/waves/[author]/[permlink]/page.tsx b/src/app/waves/[author]/[permlink]/page.tsx
index 78cc779bb..2718d9451 100644
--- a/src/app/waves/[author]/[permlink]/page.tsx
+++ b/src/app/waves/[author]/[permlink]/page.tsx
@@ -5,6 +5,7 @@ import { WaveEntry } from "@/entities";
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { getQueryClient } from "@/core/react-query";
 import { EcencyConfigManager } from "@/config";
+import { Metadata } from "next";
 
 interface Props {
   params: Promise<{
@@ -13,6 +14,11 @@ interface Props {
   }>;
 }
 
+export const metadata: Metadata = {
+  title: "Waves | Ecency",
+  description: "Micro-blogging in decentralized system of Web 3.0"
+};
+
 export default async function WaveViewPage({ params }: Props) {
   const isWavesEnabled = EcencyConfigManager.useConfig(
     ({ visionFeatures }) => visionFeatures.waves.enabled
diff --git a/src/app/waves/_components/waves-list-item-header.tsx b/src/app/waves/_components/waves-list-item-header.tsx
index 5f954eaca..573a0d13a 100644
--- a/src/app/waves/_components/waves-list-item-header.tsx
+++ b/src/app/waves/_components/waves-list-item-header.tsx
@@ -39,13 +39,15 @@ export function WavesListItemHeader({ entry, status, hasParent, pure }: Props) {
             </>
           )}
 
-          <Link
-            target="_blank"
-            className="text-sm text-gray-600 dark:text-gray-400 after:!content-none hover:underline"
-            href={`/created/${entry.category}`}
-          >
-            #{entry.host}
-          </Link>
+          {entry.host && (
+            <Link
+              target="_blank"
+              className="text-sm text-gray-600 dark:text-gray-400 after:!content-none hover:underline"
+              href={`/created/${entry.category}`}
+            >
+              #{entry.host}
+            </Link>
+          )}
         </div>
       </div>
 
diff --git a/src/app/waves/_page.tsx b/src/app/waves/_page.tsx
new file mode 100644
index 000000000..d6cac96a1
--- /dev/null
+++ b/src/app/waves/_page.tsx
@@ -0,0 +1,18 @@
+"use client";
+
+import useLocalStorage from "react-use/lib/useLocalStorage";
+import { PREFIX } from "@/utils/local-storage";
+import { WavesHostSelection } from "@/app/waves/_components/waves-host-selection";
+import { WavesCreateCard, WavesList } from "@/app/waves/_components";
+
+export function WavesPage() {
+  const [host, setHost] = useLocalStorage(PREFIX + "_wh", "ecency.waves");
+
+  return (
+    <>
+      <WavesHostSelection host={host!} setHost={setHost} />
+      <WavesCreateCard />
+      <WavesList host={host!} />
+    </>
+  );
+}
diff --git a/src/app/waves/page.tsx b/src/app/waves/page.tsx
index 80c19ea21..b25a13331 100644
--- a/src/app/waves/page.tsx
+++ b/src/app/waves/page.tsx
@@ -1,14 +1,16 @@
-"use client";
-
-import { WavesCreateCard, WavesList } from "@/app/waves/_components";
-import { WavesHostSelection } from "@/app/waves/_components/waves-host-selection";
-import useLocalStorage from "react-use/lib/useLocalStorage";
-import { PREFIX } from "@/utils/local-storage";
+import { WavesPage } from "@/app/waves/_page";
+import { Metadata } from "next";
+import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
+import { getQueryClient } from "@/core/react-query";
 import { EcencyConfigManager } from "@/config";
 import { notFound } from "next/navigation";
 
-export default function WavesPage() {
-  const [host, setHost] = useLocalStorage(PREFIX + "_wh", "ecency.waves");
+export const metadata: Metadata = {
+  title: "Waves | Ecency",
+  description: "Micro-blogging in decentralized system of Web 3.0"
+};
+
+export default function WavesServerPage() {
   const isWavesEnabled = EcencyConfigManager.useConfig(
     ({ visionFeatures }) => visionFeatures.waves.enabled
   );
@@ -18,10 +20,8 @@ export default function WavesPage() {
   }
 
   return (
-    <>
-      <WavesHostSelection host={host!} setHost={setHost} />
-      <WavesCreateCard />
-      <WavesList host={host!} />
-    </>
+    <HydrationBoundary state={dehydrate(getQueryClient())}>
+      <WavesPage />
+    </HydrationBoundary>
   );
 }