diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
index 954f9e86e57ed29fe192b936e39c4caf2267df2a..0726f87630338d70fa326ca18ba63054f3245c8d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
@@ -332,7 +332,7 @@ public class Template implements TransactionBase, Iconizable
 				Objects.equals(name, template.name) &&
 				Objects.equals(description, template.description) &&
 				Objects.equals(iconReference, template.iconReference) &&
-				Objects.equals(tags.stream().toList(), template.tags) &&
+				Objects.equals(tags == null ? null : tags.stream().toList(), template.tags) &&
 				Objects.equals(transferAccount, template.transferAccount) &&
 				Objects.equals(templateGroup, template.templateGroup);
 	}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
index 5e72d06f0e15da23fc8435e0cc49ac606b8da0fd..13bc67c1aede6e28d0426494c8b315ce53460c5d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
@@ -292,7 +292,7 @@ public class Transaction implements TransactionBase, ProvidesID
 				Objects.equals(category, transaction.category) &&
 				Objects.equals(name, transaction.name) &&
 				Objects.equals(description, transaction.description) &&
-				Objects.equals(tags.stream().toList(), transaction.tags) &&
+				Objects.equals(tags == null ? null : tags.stream().toList(), transaction.tags) &&
 				Objects.equals(repeatingOption, transaction.repeatingOption) &&
 				Objects.equals(transferAccount, transaction.transferAccount);
 	}