diff --git a/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h b/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h
index b504f20d9..369bebf54 100644
--- a/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h
+++ b/third_party/NordicSemiconductor/libraries/crypto/nrf52840-mbedtls-config.h
@@ -36,7 +36,9 @@
 #define MBEDTLS_ECDSA_C
 
 #if defined(__ICCARM__)
-    _Pragma("diag_suppress=Pe549")
-    _Pragma("diag_suppress=Pa082")
-    _Pragma("diag_suppress=Pa084")
+    _Pragma("diag_suppress=Pe550")
+#endif
+
+#if defined(__CC_ARM)
+    _Pragma("diag_suppress=550")
 #endif