diff --git a/plugins/groovy/resources/standardDsls/defaultMethods.gdsl b/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
index 13a26592035b..570dbc8eb842 100644
--- a/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
+++ b/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
@@ -46,7 +46,7 @@ def constructElementTypeArg(def psiType) {
   def typeText = psiType.canonicalText ?: psiType.presentableText
   if (!typeText || typeText == 'null') return ""
   def arg = extractTypeParameter(typeText)
-  if (!arg) return ""
+  if (!arg || arg == "null") return ""
   return "<$arg>"
 }