diff --git a/src/tls.c b/src/tls.c
index 625da6c24..86bed5982 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -1207,9 +1207,8 @@ static int TLSX_ALPN_ParseAndSet(WOLFSSL *ssl, byte *input, word16 length,
 #endif
 
     if (extension == NULL || extension->data == NULL) {
-        WOLFSSL_MSG("No ALPN extensions not used or bad");
-        return isRequest ? 0             /* not using ALPN */
-                         : BUFFER_ERROR; /* unexpected ALPN response */
+        return isRequest ? 0
+                         : TLSX_HandleUnsupportedExtension(ssl);
     }
 
     /* validating alpn list length */