diff --git a/include/psa/crypto.h b/include/psa/crypto.h
index 084049430c..db5b5f6ab2 100755
--- a/include/psa/crypto.h
+++ b/include/psa/crypto.h
@@ -336,7 +336,7 @@ typedef uint32_t psa_algorithm_t;
 #define PSA_ALG_RSA_OAEP_MGF1(hash_alg)                             \
     (PSA_ALG_RSA_OAEP_MGF1_RAW | ((hash_alg) & PSA_ALG_HASH_MASK))
 #define PSA_ALG_IS_RSA_OAEP_MGF1(alg)                               \
-    (((alg) & ~PSA_ALG_HASH_MASK) == PSA_ALG_RSA_OAEP_MGF1_RAW)
+    (((alg) & ~PSA_ALG_HASH_MASK) == PSA_ALG_RSA_OAEP_MGF1_BASE)
 #define PSA_ALG_RSA_GET_HASH(alg)                                       \
     (((alg) & PSA_ALG_HASH_MASK) | PSA_ALG_CATEGORY_HASH)
 
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2a0d59c50e..cd20738d9a 100755
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1458,7 +1458,7 @@ psa_status_t psa_asymmetric_encrypt( psa_key_slot_t key,
         else
 #endif /* MBEDTLS_PKCS1_V15 */
 #if defined(MBEDTLS_PKCS1_V21)
-        if( alg == PSA_ALG_RSA_PSS_MGF1 )
+        if( PSA_ALG_IS_RSA_OAEP_MGF1( alg ) )
         {
             return( PSA_ERROR_NOT_SUPPORTED );
         }
@@ -1535,7 +1535,7 @@ psa_status_t psa_asymmetric_decrypt( psa_key_slot_t key,
         else
 #endif /* MBEDTLS_PKCS1_V15 */
 #if defined(MBEDTLS_PKCS1_V21)
-        if( alg == PSA_ALG_RSA_PSS_MGF1 )
+        if( PSA_ALG_IS_RSA_OAEP_MGF1( alg ) )
         {
             return( PSA_ERROR_NOT_SUPPORTED );
         }