diff --git a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java
index 31d98cd777ae351031ea5c6a1a64979b0ed99387..2440efa4fe29d2b222a754c3136f1cefd6b91483 100644
--- a/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java
+++ b/gazelle-proxy-datamodel/src/main/java/net/ihe/gazelle/proxy/dao/MessageFilterStep.java
@@ -222,6 +222,14 @@ public class MessageFilterStep implements MessageFilter {
 			}
 
 			Set<Crit> paths = new HashSet<Crit>();
+
+			if (critSenders.size() == 0) {
+				filterPathFrom = false;
+			}
+			if (critReceivers.size() == 0) {
+				filterPathReceiver = false;
+			}
+
 			if (filterPathFrom && filterPathReceiver) {
 				for (Crit critSender : critSenders) {
 					for (Crit critReceiver : critReceivers) {