diff --git a/apps/www/content/primitives/components/emptystate.mdx b/apps/www/content/primitives/components/emptystate.mdx
index 37517566..8d48d19d 100644
--- a/apps/www/content/primitives/components/emptystate.mdx
+++ b/apps/www/content/primitives/components/emptystate.mdx
@@ -1,21 +1,20 @@
 ---
 title: Empty State
-description: 
+description:
 ---
+
 ## Preview
 
 <Preview>
-  <Flex
-    style={{
-      flexDirection: "column",
-      alignItems: "center",
-      gap: "8px",
-    }}
-  >
-    <EmptyState>
-      <Title>No Design Systems</Title>
-      <Text>You can create a new Design System by clicking the button.</Text>
-    </EmptyState>
+  <Flex direction="column" align="center">
+    <EmptyState
+      icon={<InfoCircledIcon />}
+      heading="Looking for new components"
+      subHeading="Check out new components in @raystack/apsara"
+      primaryAction={<Button>Primary Action</Button>}
+      secondaryAction={<Button variant="text">Secondary Action</Button>}
+    />
+
   </Flex>
 </Preview>
 
@@ -24,20 +23,35 @@ description:
 Install the component from your command line.
 
 <LiveProvider>
-    <LiveEditor code={`npm install @raystack/apsara`} border/>
+  <LiveEditor code={`npm install @raystack/apsara`} border />
 </LiveProvider>
 
+## Props
+
+The `Flex` component accepts the following props:
+
+- `icon`: Icon to show in top of empty state
+- `heading`: primary heading message
+- `subHeading`: secondary heading message
+- `primaryAction`: action to show in empty state like button or link
+- `secondaryAction`: secondary action to show in empty state like button or link
+- `classNames`: Map of className with internal components
+  - `container`
+  - `iconContainer`
+  - `icon`
+  - `heading`
+  - `subHeading`
 
 ## Anatomy
+
 Import all parts and piece them together.
 
 <LiveProvider>
     <LiveEditor code={`
-import { EmptyState } from '@raystack/apsara'
+import { EmptyState } from '@raystack/apsara/v1'
+
+<EmptyState headerText="Looking for new components" />
 
-<EmptyState style={{ marginTop: 160 }}>
-  <h3>No Design Systems</h3>
-  <p>You can create a new Design System by clicking the button.</p>
-</EmptyState>
 `} border />
+
 </LiveProvider>
diff --git a/apps/www/utils/routes.ts b/apps/www/utils/routes.ts
index dc52bf9f..9ae4e352 100644
--- a/apps/www/utils/routes.ts
+++ b/apps/www/utils/routes.ts
@@ -39,7 +39,11 @@ export const primitivesRoutes = [
         slug: "docs/primitives/components/dropdownmenu",
         newBadge: true,
       },
-      { title: "Empty State", slug: "docs/primitives/components/emptystate" },
+      {
+        title: "Empty State",
+        slug: "docs/primitives/components/emptystate",
+        newBadge: true,
+      },
       { title: "ErrorState", slug: "docs/primitives/components/errorstate" },
       {
         title: "Flex",
diff --git a/packages/raystack/emptystate/emptystate.tsx b/packages/raystack/emptystate/emptystate.tsx
index fb987007..34dc4731 100644
--- a/packages/raystack/emptystate/emptystate.tsx
+++ b/packages/raystack/emptystate/emptystate.tsx
@@ -7,6 +7,9 @@ const emptystate = cva(styles.emptystate);
 type EmptystateProps = PropsWithChildren<VariantProps<typeof emptystate>> &
   HTMLAttributes<HTMLElement>;
 
+/**
+ * @deprecated Use EmptyState from '@raystack/apsara/v1' instead.
+ */
 export function EmptyState({ children, className, ...props }: EmptystateProps) {
   return (
     <div className={emptystate({ className })} {...props}>
diff --git a/packages/raystack/v1/components/emptystate/emptystate.module.css b/packages/raystack/v1/components/emptystate/emptystate.module.css
new file mode 100644
index 00000000..211d6344
--- /dev/null
+++ b/packages/raystack/v1/components/emptystate/emptystate.module.css
@@ -0,0 +1,53 @@
+.emptyState {
+  padding: var(--rs-space-9) var(--rs-space-5);
+  width: 100%;
+  height: 100%;
+  text-align: center;
+}
+
+.iconContainer {
+  position: relative;
+  z-index: 2;
+}
+
+.icon {
+  height: 32px;
+  width: 32px;
+  padding: var(--rs-space-3);
+  box-sizing: content-box;
+  border: 1px solid var(--rs-color-border-base-primary);
+  background-color: var(--rs-color-background-base-secondary);
+  border-radius: var(--rs-radius-4);
+  color: var(--rs-color-text-base-secondary);
+  box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.08),
+    0px -3px 0px 0px rgba(0, 0, 0, 0.03) inset;
+}
+
+.icon > svg {
+  fill: currentColor;
+  height: 100%;
+  width: 100%;
+}
+
+.icon::before {
+  content: "";
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  top: -10px;
+  left: calc(50% - 15px);
+  border: inherit;
+  border-radius: inherit;
+  background-color: inherit;
+  z-index: -10;
+  transform: rotate(-42deg);
+  box-shadow: 0px -1.5px 0px 0px rgba(0, 0, 0, 0.02) inset;
+}
+
+.headerText {
+  max-width: 360px;
+}
+
+.subHeaderText {
+  max-width: 288px;
+}
diff --git a/packages/raystack/v1/components/emptystate/emptystate.tsx b/packages/raystack/v1/components/emptystate/emptystate.tsx
new file mode 100644
index 00000000..b333ad03
--- /dev/null
+++ b/packages/raystack/v1/components/emptystate/emptystate.tsx
@@ -0,0 +1,70 @@
+import { cva } from "class-variance-authority";
+import styles from "./emptystate.module.css";
+const emptystate = cva(styles.emptystate);
+import { Flex } from "../flex";
+import { Text } from "../text";
+import clsx from "clsx";
+
+type classNameKeys =
+  | "container"
+  | "iconContainer"
+  | "icon"
+  | "heading"
+  | "subHeading";
+
+interface EmptystateProps {
+  icon: React.ReactNode;
+  heading?: React.ReactNode;
+  subHeading?: React.ReactNode;
+  primaryAction?: React.ReactNode;
+  secondaryAction?: React.ReactNode;
+  classNames?: Partial<Record<classNameKeys, string>>;
+}
+
+export const EmptyState = ({
+  icon,
+  heading,
+  subHeading,
+  primaryAction,
+  secondaryAction,
+  classNames,
+}: EmptystateProps) => {
+  return (
+    <Flex
+      direction="column"
+      align="center"
+      gap="medium"
+      className={clsx(styles.emptyState, classNames?.container)}
+    >
+      <div className={clsx(styles.iconContainer, classNames?.iconContainer)}>
+        <div className={clsx(styles.icon, classNames?.icon)}>{icon}</div>
+      </div>
+
+      <Flex direction="column" gap="small" align="center">
+        {heading && (
+          <Text
+            size={5}
+            weight={500}
+            className={clsx(styles.headerText, classNames?.heading)}
+          >
+            {heading}
+          </Text>
+        )}
+
+        {subHeading && (
+          <Text
+            size={4}
+            weight={400}
+            className={clsx(styles.subHeaderText, classNames?.subHeading)}
+          >
+            {subHeading}
+          </Text>
+        )}
+      </Flex>
+
+      {primaryAction}
+
+      {secondaryAction}
+    </Flex>
+  );
+};
diff --git a/packages/raystack/v1/components/emptystate/index.tsx b/packages/raystack/v1/components/emptystate/index.tsx
new file mode 100644
index 00000000..8b490946
--- /dev/null
+++ b/packages/raystack/v1/components/emptystate/index.tsx
@@ -0,0 +1 @@
+export { EmptyState } from "./emptystate";
diff --git a/packages/raystack/v1/index.tsx b/packages/raystack/v1/index.tsx
index 0231a3cc..4ccb6780 100644
--- a/packages/raystack/v1/index.tsx
+++ b/packages/raystack/v1/index.tsx
@@ -8,6 +8,8 @@ export { ToastContainer, toast } from "./components/toast";
 export { DropdownMenu } from "./components/dropdownMenu";
 export { Text } from "./components/text";
 export { Flex } from "./components/flex";
+export { EmptyState } from "./components/emptystate";
+
 export {
   ThemeProvider,
   ThemeProviderProps,