diff --git a/CMakeLists.txt b/CMakeLists.txt
index c56fb776a7..2ab2e01ebf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,8 +198,7 @@ if(CMAKE_COMPILER_IS_GNU)
         endif()
     endif()
     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
-      # Cannot use -Wformat-truncation=2 as this fails on mbedtls_snprintf (unknown buffer size)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation=2")
     endif()
     set(CMAKE_C_FLAGS_RELEASE     "-O2")
     set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")