diff --git a/src/bin/radclient-ng.c b/src/bin/radclient-ng.c
index 6614dea332e2..3264ce623e93 100644
--- a/src/bin/radclient-ng.c
+++ b/src/bin/radclient-ng.c
@@ -1196,7 +1196,7 @@ static void client_read(fr_event_list_t *el, int fd, UNUSED int flags, void *uct
 	 *	packet matched that.
 	 */
 	if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (reply->code != request->filter_code)) {
-		if (FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(reply->code)) {
 			REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
 				fr_radius_packet_name[reply->code]);
 		} else {
diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 8793b131a01e..ea53a1fb14d5 100644
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1255,7 +1255,7 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
 	 *	packet matched that.
 	 */
 	if (request->packet->code != request->filter_code) {
-		if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(request->packet->code)) {
 			REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
 				fr_radius_packet_name[request->packet->code]);
 		} else {
@@ -1625,7 +1625,7 @@ static int recv_one_packet(fr_time_delta_t wait_time)
 	 *	packet matched that.
 	 */
 	if ((request->filter_code != FR_RADIUS_CODE_UNDEFINED) && (request->reply->code != request->filter_code)) {
-		if (FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
+		if (FR_RADIUS_PACKET_CODE_VALID(request->filter_code) && FR_RADIUS_PACKET_CODE_VALID(request->reply->code)) {
 			REDEBUG("%s: Expected %s got %s", request->name, fr_radius_packet_name[request->filter_code],
 				fr_radius_packet_name[request->reply->code]);
 		} else {
diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index e443f8e4e035..1a37c668d1ce 100644
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -2908,7 +2908,9 @@ int main(int argc, char *argv[])
 			DEBUG2("  RADIUS secret           : [%s]", conf->radius_secret);
 
 		if (conf->filter_request_code) {
-			DEBUG2("  RADIUS request code     : [%s]", fr_radius_packet_name[conf->filter_request_code]);
+			DEBUG2("  RADIUS request code     : [%s]",
+			       FR_RADIUS_PACKET_CODE_VALID(conf->filter_request_code) ?
+			       fr_radius_packet_name[conf->filter_request_code] : "unknown");
 		}
 
 		if (!fr_pair_list_empty(&conf->filter_request_vps)){
@@ -2917,7 +2919,9 @@ int main(int argc, char *argv[])
 		}
 
 		if (conf->filter_response_code) {
-			DEBUG2("  RADIUS response code    : [%s]", fr_radius_packet_name[conf->filter_response_code]);
+			DEBUG2("  RADIUS response code    : [%s]",
+			       FR_RADIUS_PACKET_CODE_VALID(conf->filter_response_code) ?
+			       fr_radius_packet_name[conf->filter_response_code] : "unknown");
 		}
 
 		if (conf->to_output_dir) {