diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
index 360e3a90e..5b67bb332 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
@@ -77,6 +77,7 @@ public class AnnotationAttributeCompletionProcessor implements CompletionProvide
 			}
 			// case: @Qualifier(value=<*>)
 			else if (node instanceof Name && node.getParent() instanceof MemberValuePair
+					&& ((MemberValuePair)node.getParent()).getName() != node
 					&& completionProviders.containsKey(((MemberValuePair)node.getParent()).getName().toString())) {
 				String attributeName = ((MemberValuePair)node.getParent()).getName().toString();
 				computeProposalsForSimpleName(project, node, attributeName, completions, offset, doc);
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/DependsOnCompletionProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/DependsOnCompletionProviderTest.java
index ce2697b4d..fce2ed044 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/DependsOnCompletionProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/DependsOnCompletionProviderTest.java
@@ -169,6 +169,11 @@ public class DependsOnCompletionProviderTest {
 		assertCompletions("@DependsOn<*>(\"XXX\")", 0, null);
 	}
 
+	@Test
+	public void testDependsOnCompletionInsideOfAttributeName() throws Exception {
+		assertCompletions("@DependsOn(<*>value=\"bean1\")", 0, null);
+	}
+	
 	@Test
 	public void testDependsOnCompletionInsideOfQuotesWithPrefixAndReplacedPostfix() throws Exception {
 		assertCompletions("@DependsOn(\"be<*>xxx\")", 2, "@DependsOn(\"bean1<*>\")");