diff --git a/runtime/queries/erlang/highlights.scm b/runtime/queries/erlang/highlights.scm
index 0cb60ca99..94f1e9f5a 100644
--- a/runtime/queries/erlang/highlights.scm
+++ b/runtime/queries/erlang/highlights.scm
@@ -38,8 +38,8 @@
   (arguments
     .
     [
-      (atom) @keyword.directive
-      (variable) @keyword.directive
+      (atom) @constant
+      (variable) @constant
       (call
         function:
           [(variable) (atom)] @keyword.directive)
@@ -99,6 +99,11 @@
 (comment) @comment
 
 ; Macros
+(macro
+  "?"+ @constant
+  name: (_) @constant
+  !arguments)
+
 (macro
   "?"+ @keyword.directive
   name: (_) @keyword.directive)