diff --git a/src/server/game/Entities/Object/BaseEntity.h b/src/server/game/Entities/Object/BaseEntity.h
index 5b7a546180..c64828808d 100644
--- a/src/server/game/Entities/Object/BaseEntity.h
+++ b/src/server/game/Entities/Object/BaseEntity.h
@@ -371,14 +371,14 @@ class TC_GAME_API BaseEntity
 
 inline BaseEntity* UF::UpdateFieldHolder::GetOwner()
 {
-#if TRINITY_COMPILER_IS_GNU
+#if TRINITY_COMPILER_IS_GCC || TRINITY_COMPILER_IS_CLANG
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #endif
 
     return reinterpret_cast<BaseEntity*>(reinterpret_cast<std::byte*>(this) - offsetof(BaseEntity, m_values));
 
-#if TRINITY_COMPILER_IS_GNU
+#if TRINITY_COMPILER_IS_GCC || TRINITY_COMPILER_IS_CLANG
 #pragma GCC diagnostic pop
 #endif
 }