diff --git a/src/Logic/Tags/And.ts b/src/Logic/Tags/And.ts
index fa14354993..bf05b3100a 100644
--- a/src/Logic/Tags/And.ts
+++ b/src/Logic/Tags/And.ts
@@ -18,6 +18,10 @@ export class And extends TagsFilter {
             console.error("Assertion failed: invalid subtags:", and)
             throw "Assertion failed: invalid subtags found"
         }
+        if (and.some((p) => p === undefined)) {
+            console.error("Assertion failed: invalid subtags:", and)
+            throw "Assertion failed: invalid subtags found (undefined)"
+        }
     }
 
     public static construct(and: ReadonlyArray<TagsFilter>): TagsFilter
diff --git a/src/UI/Popup/DeleteFlow/DeleteWizard.svelte b/src/UI/Popup/DeleteFlow/DeleteWizard.svelte
index 22ce4a0aa2..531dbb4c27 100644
--- a/src/UI/Popup/DeleteFlow/DeleteWizard.svelte
+++ b/src/UI/Popup/DeleteFlow/DeleteWizard.svelte
@@ -61,9 +61,13 @@
     const changedProperties = TagUtils.changeAsProperties(selectedTags.asChange(tags?.data ?? {}))
     const deleteReason = changedProperties[DeleteConfig.deleteReasonKey]
     if (deleteReason) {
-      const softDeletionTags=  new And([deleteConfig.softDeletionTags,
-        ...layer.tagRenderings.flatMap(tr => tr.onSoftDelete ?? [])
-      ])
+
+      let softDeletionTags: UploadableTag
+      if(hasSoftDeletion){
+        softDeletionTags = new And([deleteConfig.softDeletionTags,
+          ...layer.tagRenderings.flatMap(tr => tr.onSoftDelete ?? []),
+        ])
+      }
 
       // This is a proper, hard deletion
       actionToTake = new DeleteAction(