diff --git a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
index 182cf18b1..421ce707b 100644
--- a/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
+++ b/li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
@@ -253,7 +253,8 @@ public abstract class AbstractTransaction implements StrolchTransaction {
 
 	@Override
 	public boolean needsCommit() {
-		return !this.objectFilter.isEmpty() || !this.commands.isEmpty() || !this.flushedCommands.isEmpty();
+		return (this.objectFilter != null && !this.objectFilter.isEmpty()) || !this.commands.isEmpty()
+				|| !this.flushedCommands.isEmpty();
 	}
 
 	@Override