diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
index 6ca11a62..cf6167f4 100644
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#if defined(GLM_FORCE_SWIZZLE) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
+#if (defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE)) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
 #	error "Both GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE can't be defined at the same time"
 #endif