diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c
index d228e678b..419bd30fd 100644
--- a/wolfcrypt/src/rsa.c
+++ b/wolfcrypt/src/rsa.c
@@ -1779,6 +1779,8 @@ int wc_RsaUnPad_ex(byte* pkcsBlock, word32 pkcsBlockLen, byte** out,
 int wc_hash2mgf(enum wc_HashType hType)
 {
     switch (hType) {
+    case WC_HASH_TYPE_NONE:
+        return WC_MGF1NONE;
     case WC_HASH_TYPE_SHA:
 #ifndef NO_SHA
         return WC_MGF1SHA1;
@@ -1809,7 +1811,6 @@ int wc_hash2mgf(enum wc_HashType hType)
 #else
         break;
 #endif
-    case WC_HASH_TYPE_NONE:
     case WC_HASH_TYPE_MD2:
     case WC_HASH_TYPE_MD4:
     case WC_HASH_TYPE_MD5: