diff --git a/client/src/app/pages/controls/tags/components/tag-form.tsx b/client/src/app/pages/controls/tags/components/tag-form.tsx
index 82d5c7b693..980d14a1f7 100644
--- a/client/src/app/pages/controls/tags/components/tag-form.tsx
+++ b/client/src/app/pages/controls/tags/components/tag-form.tsx
@@ -2,7 +2,6 @@ import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { AxiosError, AxiosResponse } from "axios";
 import { object, string, mixed } from "yup";
-
 import {
   ActionGroup,
   Button,
diff --git a/client/src/app/pages/controls/tags/tags.tsx b/client/src/app/pages/controls/tags/tags.tsx
index 41670b4269..f049aa9bc5 100644
--- a/client/src/app/pages/controls/tags/tags.tsx
+++ b/client/src/app/pages/controls/tags/tags.tsx
@@ -2,7 +2,6 @@ import React, { useState } from "react";
 import { AxiosError, AxiosResponse } from "axios";
 import { useTranslation } from "react-i18next";
 import { useSelectionState } from "@migtools/lib-ui";
-
 import {
   Button,
   ButtonVariant,
diff --git a/client/src/app/queries/tags.ts b/client/src/app/queries/tags.ts
index 2e09ae2787..e7faa00e76 100644
--- a/client/src/app/queries/tags.ts
+++ b/client/src/app/queries/tags.ts
@@ -31,7 +31,7 @@ export const useFetchTags = () => {
 
 export const useFetchTagCategories = () => {
   const { data, isLoading, error, refetch } = useQuery({
-    queryKey: [TagCategoriesQueryKey],
+    queryKey: [TagCategoriesQueryKey, TagsQueryKey],
     queryFn: getTagCategories,
     onError: (error: AxiosError) => console.log("error, ", error),
   });
@@ -53,11 +53,11 @@ export const useCreateTagMutation = (
     mutationFn: createTag,
     onSuccess: (res) => {
       onSuccess(res);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
     onError: (err: AxiosError) => {
       onError(err);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
   });
 };
@@ -91,11 +91,11 @@ export const useUpdateTagMutation = (
     mutationFn: updateTag,
     onSuccess: (res) => {
       onSuccess(res);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
     onError: (err: AxiosError) => {
       onError(err);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
   });
 };
@@ -128,11 +128,11 @@ export const useDeleteTagMutation = (
     mutationFn: deleteTag,
     onSuccess: (res) => {
       onSuccess(res);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
     onError: (err: AxiosError) => {
       onError(err);
-      queryClient.invalidateQueries([TagsQueryKey]);
+      queryClient.invalidateQueries([TagCategoriesQueryKey, TagsQueryKey]);
     },
   });
 };