diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e7e569f..b946400a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ HEAD
 * Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy`
 * Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311)
 * Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314)
+* Fixed `Warning[Pa093]: implicit conversion from floating point to integer` on IAR compiler (PR #1328 by @stawiski)
 
 v6.15.2 (2020-05-15)
 -------
diff --git a/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp b/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
index e0232aae..61cd7caa 100644
--- a/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
+++ b/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
@@ -12,6 +12,11 @@
 #pragma warning(disable : 4244)
 #endif
 
+#ifdef __ICCARM__
+// Suppress IAR Compiler Warning[Pa093]: implicit conversion from floating point to integer
+#pragma diag_suppress=Pa093
+#endif
+
 namespace ARDUINOJSON_NAMESPACE {
 
 template <typename From, typename To>
@@ -32,3 +37,7 @@ struct is_convertible {
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
+
+#ifdef __ICCARM__
+#pragma diag_default=Pa093
+#endif