diff --git a/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java b/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
index 78cb877e7db..7e1be6a9cad 100644
--- a/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
+++ b/core/src/main/java/com/cloud/info/ConsoleProxyInfo.java
@@ -55,18 +55,16 @@ public class ConsoleProxyInfo {
 
     private String formatProxyAddress(String consoleProxyUrlDomain, String proxyIpAddress) {
         StringBuffer sb = new StringBuffer();
-        // Domain in format *.example.com, proxy IP is 1.2.3.4 --> 1-2-3-4.example.com
-        if (consoleProxyUrlDomain.startsWith("*")) {
+        if (StringUtils.isBlank(consoleProxyUrlDomain)) {
+            // Blank config, we use the proxy IP
+            sb.append(proxyIpAddress);
+        } else if (consoleProxyUrlDomain.startsWith("*")) {
+            // Domain in format *.example.com, proxy IP is 1.2.3.4 --> 1-2-3-4.example.com
             sb.append(proxyIpAddress.replaceAll("\\.", "-"));
             sb.append(consoleProxyUrlDomain.substring(1)); // skip the *
-
-        // Otherwise we assume a valid domain if config not blank
-        } else if (StringUtils.isNotBlank(consoleProxyUrlDomain)) {
-            sb.append(consoleProxyUrlDomain);
-
-        // Blank config, we use the proxy IP
         } else {
-            sb.append(proxyIpAddress);
+            // Otherwise we assume a valid domain if config not blank
+            sb.append(consoleProxyUrlDomain);
         }
         return sb.toString();
     }