diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
index 6456dc559..5a3584fa6 100644
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java
@@ -208,7 +208,7 @@ public class SpringBootApp {
 			Set<ObjectName> queryNames = connection.queryNames(null, null);
 			
 			for (ObjectName objectName : queryNames) {
-				if (objectName.toString().startsWith("Tomcat:type=Connector")) {
+				if (objectName.toString().startsWith("Tomcat") && objectName.toString().contains("type=Connector")) {
 					Object result = connection.getAttribute(objectName, "localPort");
 					if (result != null) {
 						return result.toString();