diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
index 2c4694748..acc8e473c 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/AbstractSpringBootApp.java
@@ -235,11 +235,11 @@ public abstract class AbstractSpringBootApp implements SpringBootApp {
 	protected Set<ObjectName> getNonBootSpringLiveMBeans() {
 		if (this.nonBootLiveMBeanNames == null) {
 			try {
-				this.nonBootLiveMBeanNames = withJmxConnector(jmxConnector -> {
+				this.nonBootLiveMBeanNames = withTimeout(() -> withJmxConnector(jmxConnector -> {
 					MBeanServerConnection connection = jmxConnector.getMBeanServerConnection();
 					QueryExp queryExp = Query.isInstanceOf(Query.value("org.springframework.context.support.LiveBeansView"));
 					return connection.queryNames(null, queryExp);
-				});
+				}));
 			} catch (Exception e) {
 				e.printStackTrace();
 				this.nonBootLiveMBeanNames = Collections.emptySet();