diff --git a/cmake/compileroptions.cmake b/cmake/compileroptions.cmake
index 671322b9db7..5d4f67b1b54 100644
--- a/cmake/compileroptions.cmake
+++ b/cmake/compileroptions.cmake
@@ -97,7 +97,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options_safe(-Wno-float-conversion)
     add_compile_options_safe(-Wno-enum-enum-conversion)
     add_compile_options_safe(-Wno-date-time)
-    add_compile_options_safe(-Wno-suggest-destructor-override) # TODO: enable when warnings are fixed in in tinyxml2
     add_compile_options(-Wno-disabled-macro-expansion)
     add_compile_options_safe(-Wno-bitwise-instead-of-logical)
 
diff --git a/lib/xml.h b/lib/xml.h
index 24983066c25..b2c2c34fce0 100644
--- a/lib/xml.h
+++ b/lib/xml.h
@@ -24,11 +24,13 @@
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
 SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt")
 SUPPRESS_WARNING_CLANG_PUSH("-Wsuggest-override")
+SUPPRESS_WARNING_CLANG_PUSH("-Wsuggest-destructor-override")
 
 #include <tinyxml2.h>
 
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 
 #endif // xmlH