diff --git a/FitConnect/Encryption/CertificateHelper.cs b/FitConnect/Encryption/CertificateHelper.cs
index 7392d5f849672747d86911b78dbfbc4655975953..146b67922c64b897f5285c5b68b4033f50524cea 100644
--- a/FitConnect/Encryption/CertificateHelper.cs
+++ b/FitConnect/Encryption/CertificateHelper.cs
@@ -37,18 +37,16 @@ public class CertificateHelper {
             certificateChain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
             certificateChain.ChainPolicy.CustomTrustStore.AddRange(rootCertificate);
             certificateChain.ChainPolicy.RevocationMode = X509RevocationMode.Online;
-            certificateChain.ChainPolicy.RevocationFlag = X509RevocationFlag.EndCertificateOnly;
+            certificateChain.ChainPolicy.RevocationFlag = X509RevocationFlag.EntireChain;
             certificateChain.ChainPolicy.VerificationFlags = X509VerificationFlags.NoFlag;
             _logger?.LogDebug("Using custom root certificate");
         }
         else {
-            certificateChain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
+            certificateChain.ChainPolicy.RevocationMode = X509RevocationMode.Online;
             certificateChain.ChainPolicy.RevocationFlag = X509RevocationFlag.EntireChain;
-            certificateChain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllFlags;
-            certificateChain.ChainPolicy.DisableCertificateDownloads = false;
+            certificateChain.ChainPolicy.VerificationFlags = X509VerificationFlags.NoFlag;
         }
-
-
+        
         var result = certificateChain.Build(certificate);
 
         chainStatus = certificateChain.ChainStatus
diff --git a/IntegrationTests/CertificateValidation.cs b/IntegrationTests/CertificateValidation.cs
index 7faae324cf7bef0fa2efe8dd5fee5faf617e6e3a..e92ba81b1d998e1b12b894ebcda9119af8ef07d0 100644
--- a/IntegrationTests/CertificateValidation.cs
+++ b/IntegrationTests/CertificateValidation.cs
@@ -117,7 +117,9 @@ public class CertificateValidation {
     public void TestDvdvCertificate() {
         var content = File.ReadAllText("./certificates/valid_dvdv.json");
         var jwk = new JsonWebKey(content);
-        var result = _certificateHelper.ValidateCertificate(jwk);
+        var result = _certificateHelper.ValidateCertificate(jwk, LogLevel.Error, Directory
+            .GetFiles("./certificates/roots")
+            .Select(file => new X509Certificate2(file)).ToArray());
         result.Should().BeTrue();
     }