diff --git a/src/components/RoomDirectory.js b/src/components/RoomDirectory.js
index aac42df..84d4027 100644
--- a/src/components/RoomDirectory.js
+++ b/src/components/RoomDirectory.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React from "react";
 import FolderSharedIcon from "@mui/icons-material/FolderShared";
 import {
   BooleanField,
@@ -130,11 +130,7 @@ export const RoomDirectorySaveButton = () => {
   );
 };
 
-const RoomDirectoryBulkActionButtons = () => (
-  <Fragment>
-    <RoomDirectoryBulkDeleteButton />
-  </Fragment>
-);
+const RoomDirectoryBulkActionButtons = () => <RoomDirectoryBulkDeleteButton />;
 
 const RoomDirectoryListActions = () => (
   <TopToolbar>
diff --git a/src/components/ServerNotices.js b/src/components/ServerNotices.js
index 631a849..751bada 100644
--- a/src/components/ServerNotices.js
+++ b/src/components/ServerNotices.js
@@ -1,4 +1,4 @@
-import React, { Fragment, useState } from "react";
+import React, { useState } from "react";
 import {
   Button,
   SaveButton,
@@ -93,7 +93,7 @@ export const ServerNoticeButton = () => {
   };
 
   return (
-    <Fragment>
+    <>
       <Button
         label="resources.servernotices.send"
         onClick={handleDialogOpen}
@@ -106,7 +106,7 @@ export const ServerNoticeButton = () => {
         onClose={handleDialogClose}
         onSend={handleSend}
       />
-    </Fragment>
+    </>
   );
 };
 
@@ -138,7 +138,7 @@ export const ServerNoticeBulkButton = () => {
   };
 
   return (
-    <Fragment>
+    <>
       <Button
         label="resources.servernotices.send"
         onClick={handleDialogOpen}
@@ -151,6 +151,6 @@ export const ServerNoticeBulkButton = () => {
         onClose={handleDialogClose}
         onSend={handleSend}
       />
-    </Fragment>
+    </>
   );
 };
diff --git a/src/components/devices.js b/src/components/devices.js
index a698d97..0ead86d 100644
--- a/src/components/devices.js
+++ b/src/components/devices.js
@@ -1,4 +1,4 @@
-import React, { Fragment, useState } from "react";
+import React, { useState } from "react";
 import {
   Button,
   useDelete,
@@ -41,7 +41,7 @@ export const DeviceRemoveButton = props => {
   };
 
   return (
-    <Fragment>
+    <>
       <Button
         label="ra.action.remove"
         onClick={handleClick}
@@ -70,6 +70,6 @@ export const DeviceRemoveButton = props => {
           name: record.display_name ? record.display_name : record.id,
         }}
       />
-    </Fragment>
+    </>
   );
 };
diff --git a/src/components/media.js b/src/components/media.js
index 5c2f361..4e7a488 100644
--- a/src/components/media.js
+++ b/src/components/media.js
@@ -1,4 +1,4 @@
-import React, { Fragment, useState } from "react";
+import React, { useState } from "react";
 import {
   BooleanInput,
   Button,
@@ -119,7 +119,7 @@ export const DeleteMediaButton = props => {
   };
 
   return (
-    <Fragment>
+    <>
       <Button
         label="resources.delete_media.action.send"
         onClick={handleDialogOpen}
@@ -142,7 +142,7 @@ export const DeleteMediaButton = props => {
         onClose={handleDialogClose}
         onSend={handleSend}
       />
-    </Fragment>
+    </>
   );
 };
 
@@ -193,7 +193,7 @@ export const ProtectMediaButton = props => {
     Wrapping Tooltip with <div>
     https://github.com/marmelab/react-admin/issues/4349#issuecomment-578594735
     */
-    <Fragment>
+    <>
       {record.quarantined_by && (
         <Tooltip
           title={translate("resources.protect_media.action.none", {
@@ -238,7 +238,7 @@ export const ProtectMediaButton = props => {
           </div>
         </Tooltip>
       )}
-    </Fragment>
+    </>
   );
 };
 
@@ -285,7 +285,7 @@ export const QuarantineMediaButton = props => {
   };
 
   return (
-    <Fragment>
+    <>
       {record.safe_from_quarantine && (
         <Tooltip
           title={translate("resources.quarantine_media.action.none", {
@@ -325,6 +325,6 @@ export const QuarantineMediaButton = props => {
           </div>
         </Tooltip>
       )}
-    </Fragment>
+    </>
   );
 };
diff --git a/src/components/rooms.js b/src/components/rooms.js
index eff2f16..7d46538 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React from "react";
 import {
   BooleanField,
   BulkDeleteButton,
@@ -279,7 +279,7 @@ export const RoomShow = props => {
 };
 
 const RoomBulkActionButtons = () => (
-  <Fragment>
+  <>
     <RoomDirectoryBulkSaveButton />
     <RoomDirectoryBulkDeleteButton />
     <BulkDeleteButton
@@ -287,7 +287,7 @@ const RoomBulkActionButtons = () => (
       confirmContent="resources.rooms.action.erase.content"
       mutationMode="pessimistic"
     />
-  </Fragment>
+  </>
 );
 
 const RoomFilter = props => (
diff --git a/src/components/users.js b/src/components/users.js
index 1e21c90..26853ac 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -1,4 +1,4 @@
-import React, { cloneElement, Fragment } from "react";
+import React, { cloneElement } from "react";
 import AssignmentIndIcon from "@mui/icons-material/AssignmentInd";
 import ContactMailIcon from "@mui/icons-material/ContactMail";
 import DevicesIcon from "@mui/icons-material/Devices";
@@ -138,7 +138,7 @@ const UserFilter = props => (
 );
 
 const UserBulkActionButtons = props => (
-  <Fragment>
+  <>
     <ServerNoticeBulkButton {...props} />
     <BulkDeleteButton
       {...props}
@@ -146,7 +146,7 @@ const UserBulkActionButtons = props => (
       confirmTitle="resources.users.helper.erase"
       mutationMode="pessimistic"
     />
-  </Fragment>
+  </>
 );
 
 export const UserList = props => {