diff --git a/src/internal.c b/src/internal.c
index 4ccda921a..85f817fe3 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -9275,7 +9275,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
             if (TLSX_SupportExtensions(ssl)) {
                 int    ret = 0;
                 word16 totalExtSz;
-                Suites clSuites; /* just for compatibility right now */
 
                 if ((i - begin) + OPAQUE16_LEN > helloSz)
                     return BUFFER_ERROR;
@@ -9287,7 +9286,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
                     return BUFFER_ERROR;
 
                 if ((ret = TLSX_Parse(ssl, (byte *) input + i,
-                                                     totalExtSz, 0, &clSuites)))
+                                                          totalExtSz, 0, NULL)))
                     return ret;
 
                 i += totalExtSz;
diff --git a/src/tls.c b/src/tls.c
index 93e8dcf32..6b67711e6 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -2149,7 +2149,7 @@ int TLSX_Parse(CYASSL* ssl, byte* input, word16 length, byte isRequest,
     int ret = 0;
     word16 offset = 0;
 
-    if (!ssl || !input || !suites)
+    if (!ssl || !input || (isRequest && !suites))
         return BAD_FUNC_ARG;
 
     while (ret == 0 && offset < length) {