diff --git a/pkg/tlsx/clients/clients.go b/pkg/tlsx/clients/clients.go
index 7db9d4cd..076f1fd5 100644
--- a/pkg/tlsx/clients/clients.go
+++ b/pkg/tlsx/clients/clients.go
@@ -324,7 +324,12 @@ func IsTLSRevoked(cert *x509.Certificate) bool {
 
 // IsZTLSRevoked returns true if the certificate has been revoked
 func IsZTLSRevoked(cert *zx509.Certificate) bool {
-	OCSPisRevoked, _, OCSPerr := zverifier.CheckOCSP(context.TODO(), cert, nil)
+	var OCSPisRevoked bool = false
+	var OCSPerr error
+	// TODO : Verify Upstream Patch and remove extra condition when fixed
+	if len(cert.IssuingCertificateURL) > 0 && len(cert.OCSPServer) > 0 {
+		OCSPisRevoked, _, OCSPerr = zverifier.CheckOCSP(context.TODO(), cert, nil)
+	}
 	if len(cert.CRLDistributionPoints) != 0 {
 		CRLisRevoked, _, CRLerr := zverifier.CheckCRL(context.TODO(), cert, nil)