diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
index 353832ce01e..fb909cdc4e9 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
@@ -244,7 +244,8 @@ namespace Trinity::ChatCommands
 namespace Trinity::Impl
 {
     template <typename T>
-    struct CastToVisitor {
+    struct CastToVisitor
+    {
         template <typename U>
         T operator()(U const& v) const { return v; }
     };
@@ -273,7 +274,7 @@ namespace Trinity::ChatCommands
         }
 
         template<bool C = have_operators>
-        operator std::enable_if_t<C && std::is_convertible<first_type, size_t>::value, size_t>() const
+        operator std::enable_if_t<C && !std::is_same_v<first_type, size_t> && std::is_convertible_v<first_type, size_t>, size_t>() const
         {
             return operator*();
         }