diff --git a/apps/cms.c b/apps/cms.c
index 91d951980d..37b1e96a14 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -862,13 +862,6 @@ int cms_main(int argc, char **argv)
         key = load_key(keyfile, keyform, 0, passin, e, "signing key");
         if (key == NULL)
             goto end;
-
-        /*
-         * TODO: Remove this when CMS has full support for provider-native
-         * EVP_PKEYs
-         */
-        if (EVP_PKEY_get0(key) == NULL)
-            goto end;
     }
 
     in = bio_open_default(infile, 'r', informat);
@@ -1067,13 +1060,6 @@ int cms_main(int argc, char **argv)
                 goto end;
             }
 
-            /*
-             * TODO: Remove this when CMS has full support for provider-native
-             * EVP_PKEYs
-             */
-            if (EVP_PKEY_get0(key) == NULL)
-                goto end;
-
             for (kparam = key_first; kparam; kparam = kparam->next) {
                 if (kparam->idx == i) {
                     tflags |= CMS_KEY_PARAM;