diff --git a/agenta-backend/pyproject.toml b/agenta-backend/pyproject.toml
index 9581546f3..55f6799ab 100644
--- a/agenta-backend/pyproject.toml
+++ b/agenta-backend/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta_backend"
-version = "0.33.7"
+version = "0.33.8"
 description = ""
 authors = ["Mahmoud Mabrouk <mahmoudmabrouk.mail@gmail.com>"]
 readme = "README.md"
diff --git a/agenta-cli/pyproject.toml b/agenta-cli/pyproject.toml
index 152176f55..a0ae9623c 100644
--- a/agenta-cli/pyproject.toml
+++ b/agenta-cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.33.7"
+version = "0.33.8"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]
diff --git a/agenta-web/package-lock.json b/agenta-web/package-lock.json
index 76145d6f2..67cae131a 100644
--- a/agenta-web/package-lock.json
+++ b/agenta-web/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "agenta",
-    "version": "0.33.7",
+    "version": "0.33.8",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "agenta",
-            "version": "0.33.7",
+            "version": "0.33.8",
             "dependencies": {
                 "@ag-grid-community/client-side-row-model": "^31.3.4",
                 "@ag-grid-community/core": "^31.3.4",
diff --git a/agenta-web/package.json b/agenta-web/package.json
index 94d398fa7..e44b9ff82 100644
--- a/agenta-web/package.json
+++ b/agenta-web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "agenta",
-    "version": "0.33.7",
+    "version": "0.33.8",
     "private": true,
     "engines": {
         "node": ">=18"
diff --git a/agenta-web/src/components/Sidebar/Sidebar.tsx b/agenta-web/src/components/Sidebar/Sidebar.tsx
index 18f13a340..8a074d5d2 100644
--- a/agenta-web/src/components/Sidebar/Sidebar.tsx
+++ b/agenta-web/src/components/Sidebar/Sidebar.tsx
@@ -32,10 +32,10 @@ const Sidebar: React.FC = () => {
     const menu = useSidebarConfig()
     const {user} = useProfileData()
     const {logout} = useSession()
-    const {project} = useProjectData()
+    const {project, projects} = useProjectData()
     const {selectedOrg, orgs, changeSelectedOrg} = useOrgData()
     const [isHovered, setIsHovered] = useState(false)
-    const dropdownItems = useDropdownItems({logout, orgs, selectedOrg, user, project})
+    const dropdownItems = useDropdownItems({logout, orgs, selectedOrg, user, project, projects})
 
     const isSidebarExpanded = useMemo(() => collapsed && !isHovered, [collapsed, isHovered])
 
diff --git a/agenta-web/src/components/Sidebar/hooks/useDropdownItems/index.tsx b/agenta-web/src/components/Sidebar/hooks/useDropdownItems/index.tsx
index 38a407500..f6ac6222b 100644
--- a/agenta-web/src/components/Sidebar/hooks/useDropdownItems/index.tsx
+++ b/agenta-web/src/components/Sidebar/hooks/useDropdownItems/index.tsx
@@ -15,11 +15,18 @@ export const useDropdownItems = ({
     orgs,
     project,
     logout,
+    projects,
 }: UseDropdownItemsProps) => {
+    const filteredOrgs = useMemo(() => {
+        return projects.flatMap((project) =>
+            orgs.filter((org) => org.id === project.organization_id && !project.is_demo),
+        )
+    }, [projects, orgs])
+
     const dropdownItems = useMemo(() => {
         if (selectedOrg?.id && user?.id && isDemo()) {
             return [
-                ...orgs.map((org: any) => ({
+                ...filteredOrgs.map((org: any) => ({
                     key: org.id,
                     label: (
                         <Space>
@@ -58,7 +65,7 @@ export const useDropdownItems = ({
         } else {
             return []
         }
-    }, [logout, orgs, project?.is_demo, selectedOrg?.id, user?.id])
+    }, [logout, filteredOrgs, project?.is_demo, selectedOrg?.id, user?.id])
 
     return dropdownItems
 }
diff --git a/agenta-web/src/components/Sidebar/hooks/useDropdownItems/types.d.ts b/agenta-web/src/components/Sidebar/hooks/useDropdownItems/types.d.ts
index 4a6280481..c7353b028 100644
--- a/agenta-web/src/components/Sidebar/hooks/useDropdownItems/types.d.ts
+++ b/agenta-web/src/components/Sidebar/hooks/useDropdownItems/types.d.ts
@@ -7,4 +7,5 @@ export type UseDropdownItemsProps = {
     orgs: Org[]
     project: ProjectsResponse | null
     logout: () => void
+    projects: ProjectsResponse[]
 }