diff --git a/src/components/RoomDirectory.js b/src/components/RoomDirectory.js
index 345dac8..bb30e75 100644
--- a/src/components/RoomDirectory.js
+++ b/src/components/RoomDirectory.js
@@ -65,7 +65,7 @@ export const RoomDirectoryBulkSaveButton = () => {
   const { selectedIds } = useListContext();
   const notify = useNotify();
   const refresh = useRefresh();
-  const unselectAll = useUnselectAll();
+  const unselectAllRooms = useUnselectAll("rooms");
   const { createMany, isloading } = useMutation();
 
   const handleSend = values => {
@@ -74,7 +74,7 @@ export const RoomDirectoryBulkSaveButton = () => {
       {
         onSuccess: data => {
           notify("resources.room_directory.action.send_success");
-          unselectAll("rooms");
+          unselectAllRooms();
           refresh();
         },
         onError: error =>
diff --git a/src/components/ServerNotices.js b/src/components/ServerNotices.js
index 92e55f6..45d45b7 100644
--- a/src/components/ServerNotices.js
+++ b/src/components/ServerNotices.js
@@ -115,7 +115,7 @@ export const ServerNoticeBulkButton = () => {
   const { selectedIds } = useListContext();
   const [open, setOpen] = useState(false);
   const notify = useNotify();
-  const unselectAll = useUnselectAll();
+  const unselectAllUsers = useUnselectAll("users");
   const { createMany, isloading } = useMutation();
 
   const handleDialogOpen = () => setOpen(true);
@@ -127,7 +127,7 @@ export const ServerNoticeBulkButton = () => {
       {
         onSuccess: data => {
           notify("resources.servernotices.action.send_success");
-          unselectAll("users");
+          unselectAllUsers();
           handleDialogClose();
         },
         onError: error =>