diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java
index f3296fef7..fa90e5719 100644
--- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java
+++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/intentions/yaml/YamlServiceTagIntention.java
@@ -149,7 +149,17 @@ public String getText() {
     private static Pair<PhpClass, Set<String>> invoke(@NotNull Project project, @NotNull YAMLKeyValue serviceKeyValue) {
 
         String aClass = YamlHelper.getYamlKeyValueAsString(serviceKeyValue, "class");
-        if(aClass == null|| StringUtils.isBlank(aClass)) {
+        if(aClass == null || StringUtils.isBlank(aClass)) {
+            PsiElement key = serviceKeyValue.getKey();
+            if (key != null) {
+                String text = key.getText();
+                if (StringUtils.isNotBlank(text) && YamlHelper.isClassServiceId(text)) {
+                    aClass = text;
+                }
+            }
+        }
+
+        if(aClass == null) {
             return null;
         }