diff --git a/tests/api.c b/tests/api.c
index 72c3b5f3e..b614e62cf 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -673,7 +673,6 @@ static void test_for_double_Free(void)
         /* First test freeing SSL, then CTX */
         wolfSSL_free(ssl);
         wolfSSL_CTX_free(ctx);
-        wolfSSL_Cleanup();
 
 #ifndef NO_WOLFSSL_CLIENT
         AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
diff --git a/wolfssl/wolfcrypt/mem_track.h b/wolfssl/wolfcrypt/mem_track.h
index 2be86d23c..975479733 100644
--- a/wolfssl/wolfcrypt/mem_track.h
+++ b/wolfssl/wolfcrypt/mem_track.h
@@ -184,6 +184,7 @@
             header->next = NULL;
             if (ourMemList.tail == NULL)  {
                 ourMemList.head = header;
+                header->prev = NULL;
             }
             else {
                 ourMemList.tail->next = header;