diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index da8c77b1f..1fe354538 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -6340,6 +6340,10 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
                     oid = dnsSRVOid;
                     *oidSz = sizeof(dnsSRVOid);
                     break;
+                case WC_NID_pkcs7_data:
+                    oid = pkcs7DataOid;
+                    *oidSz = sizeof(pkcs7DataOid);
+                    break;
                 default:
                     break;
             }
@@ -6355,18 +6359,7 @@ const byte* OidFromId(word32 id, word32 type, word32* oidSz)
             }
             break;
 #endif
-#ifdef HAVE_PKCS7
-        case oidCertNameType:
-            switch (id) {
-                case WC_NID_pkcs7_data:
-                    oid = pkcs7DataOid;
-                    *oidSz = sizeof(pkcs7DataOid);
-                    break;
-                default:
-                    break;
-            }
-            break;
-#endif /* WOLFSSL_APACHE_HTTPD */
+ /* WOLFSSL_APACHE_HTTPD */
 #ifdef WOLFSSL_CERT_REQ
         case oidCsrAttrType:
             switch (id) {