diff --git a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
index 36cb3b7d26..42112aaf4b 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/DirectoryCertificateStore.cs
@@ -417,6 +417,11 @@ namespace Opc.Ua
             return StatusCodes.BadCertificateRevocationUnknown;
         }
 
+        /// <summary>
+        /// Whether the the store support CRLs.
+        /// </summary>
+        public bool SupportsCRLs { get { return true; } }
+
         /// <summary>
         /// Returns the CRLs in the store.
         /// </summary>
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/ICertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/ICertificateStore.cs
index 9f33be5496..325abdae75 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/ICertificateStore.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/ICertificateStore.cs
@@ -66,6 +66,11 @@ namespace Opc.Ua
         /// </summary>
         StatusCode IsRevoked(X509Certificate2 issuer, X509Certificate2 certificate);
 
+        /// <summary>
+        /// Whether the store supports CRLs.
+        /// </summary>
+        bool SupportsCRLs { get; }
+
         /// <summary>
         /// Returns the CRLs in the store.
         /// </summary>
diff --git a/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs b/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs
index 5fb8ead666..909b4a26b5 100644
--- a/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs
+++ b/Stack/Opc.Ua.Core/Security/Certificates/X509CertificateStore.cs
@@ -165,6 +165,8 @@ namespace Opc.Ua
             }
         }
 
+        public bool SupportsCRLs { get { return false; } }
+
         public StatusCode IsRevoked(X509Certificate2 issuer, X509Certificate2 certificate)
         {
             throw new ServiceResultException(StatusCodes.BadNotSupported);