diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c
index 1b7d9c0..695ec20 100644
--- a/src/osmo-upf/upf_nft.c
+++ b/src/osmo-upf/upf_nft.c
@@ -129,9 +129,9 @@ static int tunmap_single_direction(char *buf, size_t buflen,
 	/* Match only UDP packets */
 	OSMO_STRBUF_PRINTF(sb, " meta l4proto udp");
 
-	/* Match on packets coming in from from_peer */
-	OSMO_STRBUF_PRINTF(sb, " ip saddr ");
-	OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, from_peer->addr_remote);
+	/* Match on packets coming in at specific local IP */
+	OSMO_STRBUF_PRINTF(sb, " ip daddr ");
+	OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, from_peer->addr_local);
 
 	/* Match on the TEID in the header */
 	OSMO_STRBUF_PRINTF(sb, " @ih,32,32 0x%08x", from_peer->teid_local);