From 25fdf676d20831cf848dc72347b2b61f5a43c062 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 12 Dec 2025 07:49:07 +1100
Subject: [PATCH] Handle linking tags in non-stash-box environment (#6402)

---
 ui/v2.5/src/components/Tagger/context.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/v2.5/src/components/Tagger/context.tsx b/ui/v2.5/src/components/Tagger/context.tsx
index fbf20ee40..fb73f21e3 100644
--- a/ui/v2.5/src/components/Tagger/context.tsx
+++ b/ui/v2.5/src/components/Tagger/context.tsx
@@ -871,8 +871,7 @@ export const TaggerContext: React.FC = ({ children }) => {
     tag: GQL.ScrapedTag,
     updateInput: GQL.TagUpdateInput
   ) {
-    if (!tag.remote_site_id || !currentSource?.sourceInput.stash_box_endpoint)
-      return;
+    const hasRemoteID = !!tag.remote_site_id;
 
     try {
       await updateTag({
@@ -889,7 +888,10 @@ export const TaggerContext: React.FC = ({ children }) => {
         return {
           ...r,
           tags: r.tags.map((t) => {
-            if (t.remote_site_id === tag.remote_site_id) {
+            if (
+              (hasRemoteID && t.remote_site_id === tag.remote_site_id) ||
+              (!hasRemoteID && t.name === tag.name)
+            ) {
               return {
                 ...t,
                 stored_id: updateInput.id,