diff --git a/lib/Query_Processor.cpp b/lib/Query_Processor.cpp
index c27f9f7f7..b523c4c63 100644
--- a/lib/Query_Processor.cpp
+++ b/lib/Query_Processor.cpp
@@ -718,19 +718,21 @@ __internal_loop:
 			}
 		}
 
-		// match on proxy_addr & proxy_port
+		// match on proxy_addr
 		if (qr->proxy_addr && strlen(qr->proxy_addr)) {
 			if (sess->client_myds->proxy_addr.addr) {
 				if (strcmp(qr->proxy_addr,sess->client_myds->proxy_addr.addr)!=0) {
 					proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_addr\n", qr->rule_id);
 					continue;
 				}
-				if (qr->proxy_port>=0) {
-					if (qr->proxy_port!=sess->client_myds->proxy_addr.port) {
-						proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_port\n", qr->rule_id);
-						continue;
-					}
-				}
+			}
+		}
+
+		// match on proxy_port
+		if (qr->proxy_port>=0) {
+			if (qr->proxy_port!=sess->client_myds->proxy_addr.port) {
+				proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has no matching proxy_port\n", qr->rule_id);
+				continue;
 			}
 		}