diff --git a/src/App.js b/src/App.js
index b6886af..6ece5a4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -54,7 +54,9 @@ function ChangeFloor({ currentFloor, callbackFloorChanged }) {
     site.buildings.forEach(building => {
       building.floors.forEach(floor => {
         items.push(
-          <MenuItem value={floor.id}>{site.name} / {building.name} / {floor.name}</MenuItem>
+          <MenuItem value={floor.id} key={floor.id}>
+            {site.name} / {building.name} / {floor.name}
+          </MenuItem>
         )
       })
     })
@@ -146,7 +148,10 @@ function RoomInformation({ roomId, setIsEditDialogOpen }) {
       names.length === 0
         ? <em>Aucun nom défini</em>
         : names.map(name => {
-            return <><Chip label={name} variant="outlined" /><br/></>
+            return <React.Fragment key={name}>
+              <Chip label={name} variant="outlined" />
+              <br/>
+            </React.Fragment>
           })
     }
 
@@ -156,7 +161,10 @@ function RoomInformation({ roomId, setIsEditDialogOpen }) {
       users.length === 0
         ? <em>Aucun utilisateur défini</em>
         : users.map(name => {
-            return <><Chip label={name} variant="outlined" /><br/></>
+            return <React.Fragment key={name}>
+              <Chip label={name} variant="outlined" />
+              <br/>
+            </React.Fragment>
           })
     }
     </div>
@@ -262,7 +270,12 @@ function EditDialog({ isOpen, setIsOpen, room }) {
       <DialogContentText>
         Noms :<br />
         {names.map(name => {
-          return <Chip label={name} variant="outlined" onDelete={() => { removeName(name) }} />
+          return <Chip
+            label={name}
+            key={name}
+            variant="outlined"
+            onDelete={() => { removeName(name) }}
+          />
         })}
 
         <TextField
@@ -278,7 +291,12 @@ function EditDialog({ isOpen, setIsOpen, room }) {
 
         Utilisateurs :<br />
         {users.map(name => {
-          return <Chip label={name} variant="outlined" onDelete={() => { removeUser(name) }} />
+          return <Chip
+            label={name}
+            key={name}
+            variant="outlined"
+            onDelete={() => { removeUser(name) }}
+          />
         })}
 
         <TextField
diff --git a/src/Rooms.js b/src/Rooms.js
index 8b8775d..ef222cf 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -20,15 +20,14 @@ export default function Rooms({ rooms, callbackRoomSelected }) {
       </TableHead>
       <TableBody>
         {rooms.map((room) => {
-          return <>
-            <TableRow
-              hover={true}
-              onClick={() => callbackRoomSelected(room.floors[0].id, room.idPlace)}
-            >
-              <TableCell>{room.namePlace[0]}</TableCell>
-              <TableCell>{room.nameBuilding}</TableCell>
-            </TableRow>
-          </>
+          return <TableRow
+            hover={true}
+            onClick={() => callbackRoomSelected(room.floors[0].id, room.idPlace)}
+            key={room.idPlace}
+          >
+            <TableCell>{room.namePlace[0]}</TableCell>
+            <TableCell>{room.nameBuilding}</TableCell>
+          </TableRow>
         })}
       </TableBody>
     </Table>