diff --git a/backend/src/services/certificate-authority/internal/internal-certificate-authority-fns.ts b/backend/src/services/certificate-authority/internal/internal-certificate-authority-fns.ts
index 9e2d9f539..212c09daf 100644
--- a/backend/src/services/certificate-authority/internal/internal-certificate-authority-fns.ts
+++ b/backend/src/services/certificate-authority/internal/internal-certificate-authority-fns.ts
@@ -62,9 +62,6 @@ export const InternalCertificateAuthorityFns = ({
     if (ca.internalCa?.status !== CaStatus.ACTIVE) throw new BadRequestError({ message: "CA is not active" });
     if (!ca.internalCa?.activeCaCertId)
       throw new BadRequestError({ message: "CA does not have a certificate installed" });
-    if (ca.disableDirectIssuance) {
-      throw new BadRequestError({ message: "Certificate template is required for issuance" });
-    }
 
     const caCert = await certificateAuthorityCertDAL.findById(ca.internalCa.activeCaCertId);
 
diff --git a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts
index 5300f77cb..b967d48ad 100644
--- a/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts
+++ b/backend/src/services/certificate-authority/internal/internal-certificate-authority-service.ts
@@ -1235,7 +1235,7 @@ export const internalCertificateAuthorityServiceFactory = ({
     if (!ca.internalCa.activeCaCertId)
       throw new BadRequestError({ message: "CA does not have a certificate installed" });
     if (ca.disableDirectIssuance && !certificateTemplate) {
-      throw new BadRequestError({ message: "Certificate template is required for issuance" });
+      throw new BadRequestError({ message: "Certificate template or subscriber is required for issuance" });
     }
 
     const caCert = await certificateAuthorityCertDAL.findById(ca.internalCa.activeCaCertId);
@@ -1593,7 +1593,7 @@ export const internalCertificateAuthorityServiceFactory = ({
     if (!ca.internalCa.activeCaCertId)
       throw new BadRequestError({ message: "CA does not have a certificate installed" });
     if (ca.disableDirectIssuance && !certificateTemplate) {
-      throw new BadRequestError({ message: "Certificate template is required for issuance" });
+      throw new BadRequestError({ message: "Certificate template or subscriber is required for issuance" });
     }
 
     const caCert = await certificateAuthorityCertDAL.findById(ca.internalCa.activeCaCertId);
diff --git a/backend/src/services/pki-subscriber/pki-subscriber-service.ts b/backend/src/services/pki-subscriber/pki-subscriber-service.ts
index 04da5e9d3..952142fc6 100644
--- a/backend/src/services/pki-subscriber/pki-subscriber-service.ts
+++ b/backend/src/services/pki-subscriber/pki-subscriber-service.ts
@@ -426,9 +426,7 @@ export const pkiSubscriberServiceFactory = ({
     if (ca.internalCa?.status !== CaStatus.ACTIVE) throw new BadRequestError({ message: "CA is not active" });
     if (!ca.internalCa?.activeCaCertId)
       throw new BadRequestError({ message: "CA does not have a certificate installed" });
-    if (ca.disableDirectIssuance) {
-      throw new BadRequestError({ message: "Certificate template is required for issuance" });
-    }
+
     const caCert = await certificateAuthorityCertDAL.findById(ca.internalCa.activeCaCertId);
 
     const certificateManagerKmsId = await getProjectKmsCertificateKeyId({