diff --git a/resources/js/Pages/ReportingShared.vue b/resources/js/Pages/ReportingShared.vue
index 837a812c..3e9c94b5 100644
--- a/resources/js/Pages/ReportingShared.vue
+++ b/resources/js/Pages/ReportingShared.vue
@@ -37,7 +37,7 @@ const pageLimit = 15;
 const currentPage = ref(1);
 
 const { data: reportsResponse } = useQuery<ReportIndexResponse>({
-    queryKey: ['reports', currentPage],
+    queryKey: computed(() => ['reports', getCurrentOrganizationId(), currentPage.value]),
     enabled: !!getCurrentOrganizationId(),
     queryFn: () =>
         api.getReports({
diff --git a/resources/js/utils/prefetch.ts b/resources/js/utils/prefetch.ts
index 0f4f7c4e..945d6222 100644
--- a/resources/js/utils/prefetch.ts
+++ b/resources/js/utils/prefetch.ts
@@ -151,7 +151,7 @@ function prefetchProjects(queryClient: QueryClient) {
     if (!organizationId) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['projects'],
+        queryKey: ['projects', organizationId],
         queryFn: () =>
             api.getProjects({
                 params: { organization: organizationId },
@@ -166,7 +166,7 @@ function prefetchTasks(queryClient: QueryClient) {
     if (!organizationId) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['tasks'],
+        queryKey: ['tasks', organizationId],
         queryFn: () =>
             api.getTasks({
                 params: { organization: organizationId },
@@ -181,7 +181,7 @@ function prefetchTags(queryClient: QueryClient) {
     if (!organizationId) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['tags'],
+        queryKey: ['tags', organizationId],
         queryFn: () =>
             api.getTags({
                 params: { organization: organizationId },
@@ -195,7 +195,7 @@ function prefetchClients(queryClient: QueryClient) {
     if (!organizationId || !canViewClients()) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['clients'],
+        queryKey: ['clients', organizationId],
         queryFn: () =>
             api.getClients({
                 params: { organization: organizationId },
@@ -210,7 +210,7 @@ function prefetchMembers(queryClient: QueryClient) {
     if (!organizationId || !canViewMembers()) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['members'],
+        queryKey: ['members', organizationId],
         queryFn: () =>
             api.getMembers({
                 params: { organization: organizationId },
@@ -224,7 +224,7 @@ function prefetchReports(queryClient: QueryClient) {
     if (!organizationId) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['reports', 1],
+        queryKey: ['reports', organizationId],
         queryFn: () =>
             api.getReports({
                 params: { organization: organizationId },
@@ -276,7 +276,7 @@ function prefetchProjectMembers(queryClient: QueryClient, projectId: string) {
     if (!organizationId || !canViewMembers()) return;
 
     queryClient.prefetchQuery({
-        queryKey: ['projectMembers', projectId],
+        queryKey: ['projectMembers', organizationId, projectId],
         queryFn: () =>
             api.getProjectMembers({
                 params: { organization: organizationId, project: projectId },
diff --git a/resources/js/utils/useClientsQuery.ts b/resources/js/utils/useClientsQuery.ts
index 091bc933..81050413 100644
--- a/resources/js/utils/useClientsQuery.ts
+++ b/resources/js/utils/useClientsQuery.ts
@@ -8,7 +8,7 @@ export function useClientsQuery() {
     const queryClient = useQueryClient();
 
     const query = useQuery({
-        queryKey: ['clients'],
+        queryKey: computed(() => ['clients', getCurrentOrganizationId()]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             if (!organizationId) throw new Error('No organization');
diff --git a/resources/js/utils/useMembersQuery.ts b/resources/js/utils/useMembersQuery.ts
index 5a716f98..e37500aa 100644
--- a/resources/js/utils/useMembersQuery.ts
+++ b/resources/js/utils/useMembersQuery.ts
@@ -8,7 +8,7 @@ export function useMembersQuery() {
     const queryClient = useQueryClient();
 
     const query = useQuery({
-        queryKey: ['members'],
+        queryKey: computed(() => ['members', getCurrentOrganizationId()]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             if (!organizationId) throw new Error('No organization');
diff --git a/resources/js/utils/useProjectMembersQuery.ts b/resources/js/utils/useProjectMembersQuery.ts
index be0fdb00..f7b7089f 100644
--- a/resources/js/utils/useProjectMembersQuery.ts
+++ b/resources/js/utils/useProjectMembersQuery.ts
@@ -12,7 +12,7 @@ export function useProjectMembersQuery(projectId: Ref<string | null> | string) {
     });
 
     const query = useQuery({
-        queryKey: ['projectMembers', projectIdValue],
+        queryKey: computed(() => ['projectMembers', getCurrentOrganizationId(), projectIdValue.value]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             const pid = projectIdValue.value;
diff --git a/resources/js/utils/useProjectsQuery.ts b/resources/js/utils/useProjectsQuery.ts
index 454e23e9..a0e6a7b2 100644
--- a/resources/js/utils/useProjectsQuery.ts
+++ b/resources/js/utils/useProjectsQuery.ts
@@ -8,7 +8,7 @@ export function useProjectsQuery() {
     const queryClient = useQueryClient();
 
     const query = useQuery({
-        queryKey: ['projects'],
+        queryKey: computed(() => ['projects', getCurrentOrganizationId()]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             if (!organizationId) throw new Error('No organization');
diff --git a/resources/js/utils/useTagsQuery.ts b/resources/js/utils/useTagsQuery.ts
index 3af68702..3ba6a66e 100644
--- a/resources/js/utils/useTagsQuery.ts
+++ b/resources/js/utils/useTagsQuery.ts
@@ -8,7 +8,7 @@ export function useTagsQuery() {
     const queryClient = useQueryClient();
 
     const query = useQuery({
-        queryKey: ['tags'],
+        queryKey: computed(() => ['tags', getCurrentOrganizationId()]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             if (!organizationId) throw new Error('No organization');
diff --git a/resources/js/utils/useTasksQuery.ts b/resources/js/utils/useTasksQuery.ts
index c50c8fea..93ee83fd 100644
--- a/resources/js/utils/useTasksQuery.ts
+++ b/resources/js/utils/useTasksQuery.ts
@@ -8,7 +8,7 @@ export function useTasksQuery() {
     const queryClient = useQueryClient();
 
     const query = useQuery({
-        queryKey: ['tasks'],
+        queryKey: computed(() => ['tasks', getCurrentOrganizationId()]),
         queryFn: async () => {
             const organizationId = getCurrentOrganizationId();
             if (!organizationId) throw new Error('No organization');
diff --git a/resources/js/utils/useTimeEntriesReportQuery.ts b/resources/js/utils/useTimeEntriesReportQuery.ts
index 208c56e8..aabb9b45 100644
--- a/resources/js/utils/useTimeEntriesReportQuery.ts
+++ b/resources/js/utils/useTimeEntriesReportQuery.ts
@@ -7,7 +7,7 @@ export function useTimeEntriesReportQuery(
     filterParams: Ref<Record<string, unknown>> | ComputedRef<Record<string, unknown>>
 ) {
     return useQuery<TimeEntryResponse>({
-        queryKey: computed(() => ['timeEntries', 'detailed-report', unref(filterParams)]),
+        queryKey: computed(() => ['timeEntries', 'detailed-report', getCurrentOrganizationId(), unref(filterParams)]),
         enabled: computed(() => !!getCurrentOrganizationId()),
         queryFn: () =>
             api.getTimeEntries({