diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
index 6ae7af9adc..f7240ceacc 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -782,9 +782,9 @@ psa_status_t psa_driver_wrapper_cipher_encrypt(
                                                 output,
                                                 output_size,
                                                 output_length ) );
-#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
-
+#else
             return( PSA_ERROR_NOT_SUPPORTED );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
 
         /* Add cases for opaque driver here */
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
@@ -864,9 +864,9 @@ psa_status_t psa_driver_wrapper_cipher_decrypt(
                                                 output,
                                                 output_size,
                                                 output_length ) );
-#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
-
+#else
             return( PSA_ERROR_NOT_SUPPORTED );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
 
         /* Add cases for opaque driver here */
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)