diff --git a/src/ssl.c b/src/ssl.c
index 346c5057c..bc21e2dbe 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -8208,19 +8208,19 @@ int wolfSSL_CertManagerEnableCRL(WOLFSSL_CERT_MANAGER* cm, int options)
 {
     int ret = WOLFSSL_SUCCESS;
 
-    (void)options;
-
     WOLFSSL_ENTER("wolfSSL_CertManagerEnableCRL");
     if (cm == NULL)
         return BAD_FUNC_ARG;
-#if defined(OPENSSL_COMPATIBLE_DEFAULTS)
     if (options == 0) {
+#if defined(OPENSSL_COMPATIBLE_DEFAULTS)
         /* Turn off doing Leaf CRL check */
         cm->crlEnabled = 0;
         /* Turn off all checks */
         cm->crlCheckAll = 0;
-    }
 #endif
+        return ret;
+    }
+
     #ifdef HAVE_CRL
         if (cm->crl == NULL) {
             cm->crl = (WOLFSSL_CRL*)XMALLOC(sizeof(WOLFSSL_CRL), cm->heap,
diff --git a/src/x509_str.c b/src/x509_str.c
index ea9b95219..4e91af864 100644
--- a/src/x509_str.c
+++ b/src/x509_str.c
@@ -979,7 +979,10 @@ int wolfSSL_X509_STORE_set_flags(WOLFSSL_X509_STORE* store, unsigned long flag)
     if (store == NULL)
         return WOLFSSL_FAILURE;
 
-    ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag);
+    if ((flag & WOLFSSL_CRL_CHECKALL) || (flag & WOLFSSL_CRL_CHECK) ||
+         flag == 0 ) {
+        ret = wolfSSL_CertManagerEnableCRL(store->cm, (int)flag);
+    }
 
     return ret;
 }