diff --git a/web/ce/components/issues/issue-layouts/empty-states/index.ts b/web/ce/components/issues/issue-layouts/empty-states/index.ts
new file mode 100644
index 0000000000..319b4c6844
--- /dev/null
+++ b/web/ce/components/issues/issue-layouts/empty-states/index.ts
@@ -0,0 +1,2 @@
+export * from "./team-issues";
+export * from "./team-view-issues";
diff --git a/web/ce/components/issues/issue-layouts/empty-states/team-issues.tsx b/web/ce/components/issues/issue-layouts/empty-states/team-issues.tsx
new file mode 100644
index 0000000000..1e05f40cbd
--- /dev/null
+++ b/web/ce/components/issues/issue-layouts/empty-states/team-issues.tsx
@@ -0,0 +1,3 @@
+import { observer } from "mobx-react";
+
+export const TeamEmptyState: React.FC = observer(() => <></>);
diff --git a/web/ce/components/issues/issue-layouts/empty-states/team-view-issues.tsx b/web/ce/components/issues/issue-layouts/empty-states/team-view-issues.tsx
new file mode 100644
index 0000000000..03b546be53
--- /dev/null
+++ b/web/ce/components/issues/issue-layouts/empty-states/team-view-issues.tsx
@@ -0,0 +1,3 @@
+import { observer } from "mobx-react";
+
+export const TeamViewEmptyState: React.FC = observer(() => <></>);
diff --git a/web/core/components/issues/issue-layouts/empty-states/index.tsx b/web/core/components/issues/issue-layouts/empty-states/index.tsx
index f2d4215268..decf0e4029 100644
--- a/web/core/components/issues/issue-layouts/empty-states/index.tsx
+++ b/web/core/components/issues/issue-layouts/empty-states/index.tsx
@@ -1,4 +1,6 @@
 import { EIssuesStoreType } from "@plane/constants";
+// plane web components
+import { TeamEmptyState, TeamViewEmptyState } from "@/plane-web/components/issues/issue-layouts/empty-states";
 // components
 import { ProjectArchivedEmptyState } from "./archived-issues";
 import { CycleEmptyState } from "./cycle";
@@ -34,6 +36,10 @@ export const IssueLayoutEmptyState = (props: Props) => {
       return <ProfileViewEmptyState />;
     case EIssuesStoreType.EPIC:
       return <ProjectEpicsEmptyState />;
+    case EIssuesStoreType.TEAM:
+      return <TeamEmptyState />;
+    case EIssuesStoreType.TEAM_VIEW:
+      return <TeamViewEmptyState />;
     default:
       return null;
   }
diff --git a/web/ee/components/issues/issue-layouts/empty-states/index.ts b/web/ee/components/issues/issue-layouts/empty-states/index.ts
new file mode 100644
index 0000000000..a0739e26ad
--- /dev/null
+++ b/web/ee/components/issues/issue-layouts/empty-states/index.ts
@@ -0,0 +1 @@
+export * from "ce/components/issues/issue-layouts/empty-states";
diff --git a/web/helpers/emoji.helper.tsx b/web/helpers/emoji.helper.tsx
index 4d76529caf..9b7aa53731 100644
--- a/web/helpers/emoji.helper.tsx
+++ b/web/helpers/emoji.helper.tsx
@@ -8,7 +8,6 @@ export const getRandomEmoji = () => {
     "128204",
     "127773",
     "127891",
-    "127947",
     "128076",
     "128077",
     "128187",