diff --git a/0058-FIPS-limit-rsa-encrypt.patch b/0058-FIPS-limit-rsa-encrypt.patch
index 6dcf7c0..b9cc3aa 100644
--- a/0058-FIPS-limit-rsa-encrypt.patch
+++ b/0058-FIPS-limit-rsa-encrypt.patch
@@ -19,7 +19,7 @@ diff -up openssl-3.0.1/providers/implementations/asymciphers/rsa_enc.c.no_bad_pa
 +# ifdef FIPS_MODULE
 +static int fips_padding_allowed(const PROV_RSA_CTX *prsactx)
 +{
-+    if (prsactx->pad_mode == RSA_PKCS1_PADDING
++    if (prsactx->pad_mode == RSA_PKCS1_PADDING || prsactx->pad_mode == RSA_NO_PADDING
 +        || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING)
 +        return 0;
 +
diff --git a/0088-signature-Add-indicator-for-PSS-salt-length.patch b/0088-signature-Add-indicator-for-PSS-salt-length.patch
index 97a0679..20024d3 100644
--- a/0088-signature-Add-indicator-for-PSS-salt-length.patch
+++ b/0088-signature-Add-indicator-for-PSS-salt-length.patch
@@ -35,6 +35,9 @@ EVP_PKEY_CTX_get_params() with the
   OSSL_SIGNATURE_PARAM_REDHAT_FIPS_INDICATOR
 parameter.
 
+We also add indicator for RSA_NO_PADDING here to avoid patch-over-patch.
+Dmitry Belyavskiy <dbelyavs@redhat.com>
+
 Signed-off-by: Clemens Lang <cllang@redhat.com>
 ---
  include/openssl/core_names.h                  |  1 +
@@ -73,7 +76,7 @@ diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implement
 index 49e7f9158a..0c45008a00 100644
 --- a/providers/implementations/signature/rsa_sig.c
 +++ b/providers/implementations/signature/rsa_sig.c
-@@ -1127,6 +1127,21 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
+@@ -1127,6 +1127,24 @@ static int rsa_get_ctx_params(void *vprsactx, OSSL_PARAM *params)
          }
      }
  
@@ -87,6 +90,9 @@ index 49e7f9158a..0c45008a00 100644
 +            } else if (rsa_pss_compute_saltlen(prsactx) > EVP_MD_get_size(prsactx->md)) {
 +                fips_indicator = EVP_SIGNATURE_REDHAT_FIPS_INDICATOR_NOT_APPROVED;
 +            }
++        } else if (prsactx->pad_mode == RSA_NO_PADDING) {
++            if (prsactx->md == NULL) /* Should always be the case */
++                fips_indicator = EVP_SIGNATURE_REDHAT_FIPS_INDICATOR_NOT_APPROVED;
 +        }
 +        return OSSL_PARAM_set_int(p, fips_indicator);
 +    }
diff --git a/openssl.spec b/openssl.spec
index baa961c..3aed55f 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -513,6 +513,8 @@ install -m644 %{SOURCE9} \
 - Add explicit FIPS indicator for PBKDF2, use test vector with FIPS-compliant
   salt in PBKDF2 FIPS self-test
   Resolves: rhbz#2178137
+- Limit RSA_NO_PADDING for encryption and signature in FIPS mode
+  Resolves: rhbz#2178029
 
 * Wed Mar 08 2023 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.0.7-6
 - Fixes RNG slowdown in FIPS mode