diff --git a/components/chat-list.tsx b/components/chat-list.tsx
index 808fd90..cf6b830 100644
--- a/components/chat-list.tsx
+++ b/components/chat-list.tsx
@@ -4,25 +4,24 @@ import { type Message } from 'ai-connector'
 
 import { Separator } from '@/components/ui/separator'
 import { ChatMessage } from '@/components/chat-message'
-import { EmptyScreen } from '@/components/empty-screen'
 
 export interface ChatList {
   messages: Message[]
 }
 
 export function ChatList({ messages }: ChatList) {
+  if (!messages.length) {
+    return null
+  }
+
   return (
     <div className="relative mx-auto max-w-2xl px-4">
-      {messages.length > 0 ? (
-        messages.map((message, index) => (
-          <div key={index}>
-            <ChatMessage message={message} />
-            {index < messages.length - 1 && <Separator className="my-8" />}
-          </div>
-        ))
-      ) : (
-        <EmptyScreen />
-      )}
+      {messages.map((message, index) => (
+        <div key={index}>
+          <ChatMessage message={message} />
+          {index < messages.length - 1 && <Separator className="my-8" />}
+        </div>
+      ))}
     </div>
   )
 }
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index 3559b71..6bd0a40 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -1,4 +1,4 @@
-import { UseChatHelpers } from 'ai-connector'
+import { type UseChatHelpers } from 'ai-connector'
 
 import { Button } from '@/components/ui/button'
 import { ExternalLink } from '@/components/external-link'
@@ -9,7 +9,13 @@ import { IconRefresh, IconStop } from '@/components/ui/icons'
 export interface ChatPanelProps
   extends Pick<
     UseChatHelpers,
-    'append' | 'isLoading' | 'reload' | 'messages' | 'stop'
+    | 'append'
+    | 'isLoading'
+    | 'reload'
+    | 'messages'
+    | 'stop'
+    | 'input'
+    | 'setInput'
   > {
   id?: string
 }
@@ -19,6 +25,8 @@ export function ChatPanel({
   stop,
   append,
   reload,
+  input,
+  setInput,
   messages
 }: ChatPanelProps) {
   return (
@@ -56,6 +64,8 @@ export function ChatPanel({
                 role: 'user'
               })
             }}
+            input={input}
+            setInput={setInput}
             isLoading={isLoading}
           />
           <p className="hidden px-2 text-center text-xs leading-normal text-muted-foreground sm:block">
diff --git a/components/chat.tsx b/components/chat.tsx
index c7fff5d..4352cc6 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -2,24 +2,32 @@
 
 import { useChat, type Message } from 'ai-connector'
 
+import { cn } from '@/lib/utils'
 import { ChatList } from '@/components/chat-list'
 import { ChatPanel } from '@/components/chat-panel'
+import { EmptyScreen } from '@/components/empty-screen'
 
-export interface ChatProps {
-  // create?: (input: string) => Chat | undefined;
+export interface ChatProps extends React.ComponentProps<'div'> {
   initialMessages?: Message[]
   id?: string
 }
 
-export function Chat({ id, initialMessages }: ChatProps) {
-  const { messages, append, reload, stop, isLoading } = useChat({
-    initialMessages,
-    id
-  })
+export function Chat({ id, initialMessages, className }: ChatProps) {
+  const { messages, append, reload, stop, isLoading, input, setInput } =
+    useChat({
+      initialMessages,
+      id
+    })
 
   return (
-    <div className="pb-[200px] pt-4 md:pt-10">
-      <ChatList messages={messages} />
+    <>
+      <div className={cn('pb-[200px] pt-4 md:pt-10', className)}>
+        {messages.length ? (
+          <ChatList messages={messages} />
+        ) : (
+          <EmptyScreen setInput={setInput} />
+        )}
+      </div>
       <ChatPanel
         id={id}
         isLoading={isLoading}
@@ -27,7 +35,9 @@ export function Chat({ id, initialMessages }: ChatProps) {
         append={append}
         reload={reload}
         messages={messages}
+        input={input}
+        setInput={setInput}
       />
-    </div>
+    </>
   )
 }
diff --git a/components/empty-screen.tsx b/components/empty-screen.tsx
index b2804c4..e739b31 100644
--- a/components/empty-screen.tsx
+++ b/components/empty-screen.tsx
@@ -1,8 +1,8 @@
-import { useChatStore } from '@/lib/hooks/use-chat-store'
 import { cn } from '@/lib/utils'
 import { Button } from '@/components/ui/button'
 import { ExternalLink } from '@/components/external-link'
 import { IconArrowRight } from '@/components/ui/icons'
+import { UseChatHelpers } from 'ai-connector'
 
 const exampleMessages = [
   {
@@ -19,37 +19,37 @@ const exampleMessages = [
   }
 ]
 
-export function EmptyScreen({ className }: React.ComponentProps<'div'>) {
-  const { setDefaultMessage } = useChatStore()
-
+export function EmptyScreen({ setInput }: Pick<UseChatHelpers, 'setInput'>) {
   return (
-    <div className={cn('rounded-lg border bg-background p-8', className)}>
-      <h1 className="mb-2 text-lg font-semibold">
-        Welcome to Next.js Chatbot!
-      </h1>
-      <p className="mb-2 leading-normal text-muted-foreground">
-        This is an open source AI chatbot app built with{' '}
-        <ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
-        <ExternalLink href="https://vercel.com/storage/kv">
-          Vercel KV
-        </ExternalLink>
-        .
-      </p>
-      <p className="leading-normal text-muted-foreground">
-        You can start a conversation here or try the following examples:
-      </p>
-      <div className="mt-4 flex flex-col items-start space-y-2">
-        {exampleMessages.map((message, index) => (
-          <Button
-            key={index}
-            variant="link"
-            className="h-auto p-0 text-base"
-            onClick={() => setDefaultMessage(message.message)}
-          >
-            <IconArrowRight className="mr-2 text-muted-foreground" />
-            {message.heading}
-          </Button>
-        ))}
+    <div className="mx-auto max-w-2xl px-4">
+      <div className="rounded-lg border bg-background p-8">
+        <h1 className="mb-2 text-lg font-semibold">
+          Welcome to Next.js Chatbot!
+        </h1>
+        <p className="mb-2 leading-normal text-muted-foreground">
+          This is an open source AI chatbot app built with{' '}
+          <ExternalLink href="https://nextjs.org">Next.js</ExternalLink> and{' '}
+          <ExternalLink href="https://vercel.com/storage/kv">
+            Vercel KV
+          </ExternalLink>
+          .
+        </p>
+        <p className="leading-normal text-muted-foreground">
+          You can start a conversation here or try the following examples:
+        </p>
+        <div className="mt-4 flex flex-col items-start space-y-2">
+          {exampleMessages.map((message, index) => (
+            <Button
+              key={index}
+              variant="link"
+              className="h-auto p-0 text-base"
+              onClick={() => setInput(message.message)}
+            >
+              <IconArrowRight className="mr-2 text-muted-foreground" />
+              {message.heading}
+            </Button>
+          ))}
+        </div>
       </div>
     </div>
   )
diff --git a/components/prompt-form.tsx b/components/prompt-form.tsx
index f42cd17..1fbc7b1 100644
--- a/components/prompt-form.tsx
+++ b/components/prompt-form.tsx
@@ -2,7 +2,6 @@ import * as React from 'react'
 import Link from 'next/link'
 import Textarea from 'react-textarea-autosize'
 
-import { useChatStore } from '@/lib/hooks/use-chat-store'
 import { useEnterSubmit } from '@/lib/hooks/use-enter-submit'
 import { cn } from '@/lib/utils'
 import { Button, buttonVariants } from '@/components/ui/button'
@@ -13,15 +12,20 @@ import {
   TooltipTrigger
 } from '@/components/ui/tooltip'
 import { IconArrowElbow, IconPlus } from '@/components/ui/icons'
+import { UseChatHelpers } from 'ai-connector'
 
-export interface PromptProps {
+export interface PromptProps
+  extends Pick<UseChatHelpers, 'input' | 'setInput'> {
   onSubmit: (value: string) => void
   isLoading: boolean
 }
 
-export function PromptForm({ onSubmit, isLoading }: PromptProps) {
-  const { defaultMessage } = useChatStore()
-  const [input, setInput] = React.useState(defaultMessage)
+export function PromptForm({
+  onSubmit,
+  input,
+  setInput,
+  isLoading
+}: PromptProps) {
   const { formRef, onKeyDown } = useEnterSubmit()
   const inputRef = React.useRef<HTMLTextAreaElement>(null)
 
@@ -31,10 +35,6 @@ export function PromptForm({ onSubmit, isLoading }: PromptProps) {
     }
   }, [])
 
-  React.useEffect(() => {
-    setInput(defaultMessage)
-  }, [defaultMessage])
-
   return (
     <form
       onSubmit={async e => {
diff --git a/lib/hooks/use-chat-store.ts b/lib/hooks/use-chat-store.ts
deleted file mode 100644
index e6e913c..0000000
--- a/lib/hooks/use-chat-store.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { create } from 'zustand'
-
-interface UseChatStore {
-  defaultMessage: string
-  setDefaultMessage: (message: string) => void
-}
-
-export const useChatStore = create<UseChatStore>()(set => ({
-  defaultMessage: '',
-  setDefaultMessage: message => set({ defaultMessage: message })
-}))
diff --git a/package.json b/package.json
index 646b9b7..96a74ed 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,7 @@
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.4.1",
     "remark-gfm": "^3.0.1",
-    "remark-math": "^5.1.1",
-    "zustand": "^4.3.8"
+    "remark-math": "^5.1.1"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a5f796b..a765a30 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -86,9 +86,6 @@ dependencies:
   remark-math:
     specifier: ^5.1.1
     version: 5.1.1
-  zustand:
-    specifier: ^4.3.8
-    version: 4.3.8(react@18.2.0)
 
 devDependencies:
   '@tailwindcss/typography':
@@ -5070,22 +5067,6 @@ packages:
   /zod@3.21.4:
     resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}
 
-  /zustand@4.3.8(react@18.2.0):
-    resolution: {integrity: sha512-4h28KCkHg5ii/wcFFJ5Fp+k1J3gJoasaIbppdgZFO4BPJnsNxL0mQXBSFgOgAdCdBj35aDTPvdAJReTMntFPGg==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      immer: '>=9.0'
-      react: '>=16.8'
-    peerDependenciesMeta:
-      immer:
-        optional: true
-      react:
-        optional: true
-    dependencies:
-      react: 18.2.0
-      use-sync-external-store: 1.2.0(react@18.2.0)
-    dev: false
-
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: false