diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
index f6bbd5572f..62673d14f9 100644
--- a/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterMenu.java
@@ -158,9 +158,6 @@ protected void saveData(ItemStack filterItem) {
 		});
 		filterItem.getOrCreateTag()
 			.put("MatchedAttributes", attributes);
-
-		if (attributes.isEmpty() && whitelistMode == WhitelistMode.WHITELIST_DISJ)
-			filterItem.setTag(null);
 	}
 
 }
diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
index 90015861b0..5c8c14a9a5 100644
--- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
@@ -196,8 +196,6 @@ public boolean test(Level world, FluidStack stack, boolean matchNBT) {
 
 		@Override
 		public boolean test(Level world, ItemStack stack, boolean matchNBT) {
-			if (attributeTests.isEmpty())
-				return super.test(world, stack, matchNBT);
 			for (Pair<ItemAttribute, Boolean> test : attributeTests) {
 				ItemAttribute attribute = test.getFirst();
 				boolean inverted = test.getSecond();
@@ -248,8 +246,7 @@ public PackageFilterItemStack(ItemStack filter) {
 
 		@Override
 		public boolean test(Level world, ItemStack stack, boolean matchNBT) {
-			return (filterString.isBlank() && super.test(world, stack, matchNBT))
-				|| PackageItem.isPackage(stack) && PackageItem.matchAddress(stack, filterString);
+			return PackageItem.isPackage(stack) && PackageItem.matchAddress(stack, filterString);
 		}
 
 		@Override
diff --git a/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java b/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
index 3e62aacba5..04fefca902 100644
--- a/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
+++ b/src/main/java/com/simibubi/create/content/logistics/filter/FilterMenu.java
@@ -66,14 +66,6 @@ protected void saveData(ItemStack filterItem) {
 		CompoundTag tag = filterItem.getOrCreateTag();
 		tag.putBoolean("RespectNBT", respectNBT);
 		tag.putBoolean("Blacklist", blacklist);
-
-		if (respectNBT || blacklist)
-			return;
-		for (int i = 0; i < ghostInventory.getSlots(); i++)
-			if (!ghostInventory.getStackInSlot(i)
-				.isEmpty())
-				return;
-		filterItem.setTag(null);
 	}
 
 }