diff --git a/web/src/views/Settings/TwoFactorAuthentication/WebauthnDevices.tsx b/web/src/views/Settings/TwoFactorAuthentication/WebauthnDevices.tsx
index 6f50f2919..b6b99d150 100644
--- a/web/src/views/Settings/TwoFactorAuthentication/WebauthnDevices.tsx
+++ b/web/src/views/Settings/TwoFactorAuthentication/WebauthnDevices.tsx
@@ -83,34 +83,34 @@ export default function TwoFactorAuthSettings(props: Props) {
                             {"Add new device"}
                         </Button>
                     </Box>
-                    <Box>
-                        <Table>
-                            <TableHead>
-                                <TableRow>
-                                    <TableCell />
-                                    <TableCell>{translate("Name")}</TableCell>
-                                    <TableCell>{translate("Enabled")}</TableCell>
-                                    <TableCell align="center">{translate("Actions")}</TableCell>
-                                </TableRow>
-                            </TableHead>
-                            <TableBody>
-                                {webauthnDevices
-                                    ? webauthnDevices.map((x, idx) => {
-                                          return (
-                                              <WebauthnDeviceItem
-                                                  device={x}
-                                                  idx={idx}
-                                                  webauthnShowDetails={webauthnShowDetails}
-                                                  handleWebAuthnDetailsChange={handleWebAuthnDetailsChange}
-                                                  handleDeleteItem={handleDeleteItem}
-                                                  key={`webauthn-device-${idx}`}
-                                              />
-                                          );
-                                      })
-                                    : null}
-                            </TableBody>
-                        </Table>
-                    </Box>
+                    {webauthnDevices ? (
+                        <Box>
+                            <Table>
+                                <TableHead>
+                                    <TableRow>
+                                        <TableCell />
+                                        <TableCell>{translate("Name")}</TableCell>
+                                        <TableCell>{translate("Enabled")}</TableCell>
+                                        <TableCell align="center">{translate("Actions")}</TableCell>
+                                    </TableRow>
+                                </TableHead>
+                                <TableBody>
+                                    {webauthnDevices.map((x, idx) => {
+                                        return (
+                                            <WebauthnDeviceItem
+                                                device={x}
+                                                idx={idx}
+                                                webauthnShowDetails={webauthnShowDetails}
+                                                handleWebAuthnDetailsChange={handleWebAuthnDetailsChange}
+                                                handleDeleteItem={handleDeleteItem}
+                                                key={`webauthn-device-${idx}`}
+                                            />
+                                        );
+                                    })}
+                                </TableBody>
+                            </Table>
+                        </Box>
+                    ) : null}
                 </Stack>
             </Box>
         </Paper>