From 3658ea420c391d74f6c52825843ad39c8c514864 Mon Sep 17 00:00:00 2001
From: bymoxb <moxb@outlook.es>
Date: Wed, 21 Oct 2026 09:45:33 -0400
Subject: [PATCH] Backport pull request #8347 from jellyfin-web/release-12.z

Fix Delete All device deletion

Original-merge: ee1ccf88a00ddd504d883273ad01bde30b9640a6

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: thornbill <thornbill@users.noreply.github.com>
---
 CONTRIBUTORS.md                             | 1 +
 src/apps/dashboard/routes/devices/index.tsx | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4ae828292a..aeaaa99779 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -111,6 +111,7 @@
 - [Alex Dickens](https://github.com/alex-dicko)
 - [shindouj](https://github.com/shindouj)
 - [TheDreadPirate](https://github.com/thedreaddpirate)
+- [bymoxb](https://github.com/bymoxb)
 
 ## Emby Contributors
 
diff --git a/src/apps/dashboard/routes/devices/index.tsx b/src/apps/dashboard/routes/devices/index.tsx
index f1d857e763..df2120a442 100644
--- a/src/apps/dashboard/routes/devices/index.tsx
+++ b/src/apps/dashboard/routes/devices/index.tsx
@@ -96,7 +96,8 @@ export const Component = () => {
         if (devices) {
             Promise
                 .all(devices.map(item => {
-                    if (api && item.Id && api.deviceInfo.id === item.Id) {
+                    const isCurrentDevice = api && item.Id && api.deviceInfo.id === item.Id;
+                    if (item.Id && !isCurrentDevice) {
                         return deleteDevice.mutateAsync({ id: [item.Id] });
                     }
                     return Promise.resolve();
@@ -208,7 +209,7 @@ export const Component = () => {
             }
         },
         renderRowActions: ({ row, table }) => {
-            const isDeletable = api && row.original.Id && api.deviceInfo.id === row.original.Id;
+            const isCurrentDevice = api && row.original.Id && api.deviceInfo.id === row.original.Id;
             return (
                 <Box
                     sx={{
@@ -227,7 +228,7 @@ export const Component = () => {
                         </IconButton>
                     </Tooltip>
                     {/* Don't include Tooltip when disabled */}
-                    {isDeletable ? (
+                    {isCurrentDevice ? (
                         <IconButton
                             color='error'
                             disabled