diff --git a/include/icsneo/communication/message/filter/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h
index fd76ac3..d512948 100644
--- a/include/icsneo/communication/message/filter/messagefilter.h
+++ b/include/icsneo/communication/message/filter/messagefilter.h
@@ -34,6 +34,8 @@ public:
 				return false;
 			if(!matchNetID(frame.network.getNetID()))
 				return false;
+		} else if (netid != Network::NetID::Any || networkType != Network::Type::Any) {
+			return false; // Filtering on a NetID or Type, but this message doesn't have one
 		}
 		return true;
 	}