diff --git a/src/ssl.c b/src/ssl.c
index e98ae1cb6..85468627f 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -8296,6 +8296,7 @@ int wolfSSL_Cleanup(void)
 
     if (wolfCrypt_Cleanup() != 0) {
         WOLFSSL_MSG("Error with wolfCrypt_Cleanup call");
+        ret = WC_CLEANUP_E;
     }
 
     return ret;
diff --git a/wolfcrypt/src/error.c b/wolfcrypt/src/error.c
index 2de4e7c0a..2981bfdc0 100644
--- a/wolfcrypt/src/error.c
+++ b/wolfcrypt/src/error.c
@@ -407,6 +407,9 @@ const char* wc_GetErrorString(int error)
     case BAD_KEYWRAP_IV_E:
         return "Decrypted AES key wrap IV does not match expected";
 
+    case WC_CLEANUP_E:
+        return "wolfcrypt cleanup failed";
+
     default:
         return "unknown error number";
 
diff --git a/wolfssl/wolfcrypt/error-crypt.h b/wolfssl/wolfcrypt/error-crypt.h
index 9ebdc5d21..bd8b83636 100644
--- a/wolfssl/wolfcrypt/error-crypt.h
+++ b/wolfssl/wolfcrypt/error-crypt.h
@@ -180,6 +180,7 @@ enum {
 
     BAD_KEYWRAP_ALG_E   = -239,
     BAD_KEYWRAP_IV_E    = -240,  /* Decrypted AES key wrap IV incorrect */
+    WC_CLEANUP_E        = -241,  /* wolfcrypt cleanup failed */
 
     MIN_CODE_E          = -300   /* errors -101 - -299 */