diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
index 30a378b61d10..e9d43a4f3bcd 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java
@@ -121,8 +121,8 @@ public final class RegExpLanguageHosts extends ClassExtension<RegExpLanguageHost
     return host != null && host.supportsPythonConditionalRefs();
   }
 
-  public boolean supportsPossessiveQuantifiers(@Nullable final RegExpQuantifier quantifier) {
-    final RegExpLanguageHost host = findRegExpHost(quantifier);
+  public boolean supportsPossessiveQuantifiers(@Nullable final RegExpElement context) {
+    final RegExpLanguageHost host = findRegExpHost(context);
     return host == null || host.supportsPossessiveQuantifiers();
   }
 
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
index ab05d58741f0..b49c76cb978d 100644
--- a/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/validation/RegExpAnnotator.java
@@ -280,6 +280,9 @@ public final class RegExpAnnotator extends RegExpElementVisitor implements Annot
         myHolder.createErrorAnnotation(group, "This named group syntax is not supported");
       }
     }
+    if (group.getType() == RegExpGroup.Type.ATOMIC && !myLanguageHosts.supportsPossessiveQuantifiers(group)) {
+      myHolder.createErrorAnnotation(group, "Atomic groups are not supported in this regex dialect");
+    }
     final String name = group.getName();
     if (name != null && !myLanguageHosts.isValidGroupName(name, group)) {
       final ASTNode node = group.getNode().findChildByType(RegExpTT.NAME);