diff --git a/src/js/client.js b/src/js/client.js
index a48cb675d..059a3053b 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -658,6 +658,15 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.getServerIp = function (callback) {
+        get('/api/v1/cloudron/server_ip', null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null, data.ip);
+        });
+    };
+
     Client.prototype.getSysinfoConfig = function (callback) {
         get('/api/v1/settings/sysinfo_config', null, function (error, data, status) {
             if (error) return callback(error);
diff --git a/src/views/network.html b/src/views/network.html
index bae5043a9..cf96a9052 100644
--- a/src/views/network.html
+++ b/src/views/network.html
@@ -70,12 +70,13 @@
       </div>
     </div>
 
-    <div class="row" ng-show="sysinfo.ip">
+    <div class="row">
       <div class="col-xs-6">
         <span class="text-muted">IP Address</span>
       </div>
       <div class="col-xs-6 text-right">
-        <span>{{ sysinfo.ip }}</span>
+        <span ng-show="sysinfo.ip">{{ sysinfo.ip }}</span>
+        <span ng-show="!sysinfo.ip">{{ sysinfo.serverIp }} (detected)</span>
       </div>
     </div>
 
diff --git a/src/views/network.js b/src/views/network.js
index a586ff8cb..5b2c51dfe 100644
--- a/src/views/network.js
+++ b/src/views/network.js
@@ -59,6 +59,8 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
         busy: false,
         error: {},
 
+        serverIp: '',
+
         provider: '',
         ip: '',
         ifname: '',
@@ -75,6 +77,12 @@ angular.module('Application').controller('NetworkController', ['$scope', '$locat
                 $scope.sysinfo.provider = result.provider;
                 $scope.sysinfo.ip = result.ip || '';
                 $scope.sysinfo.ifname = result.ifname || '';
+
+                Client.getServerIp(function (error, ip) {
+                    if (error) return console.error(error);
+
+                    $scope.sysinfo.serverIp = ip;
+                });
             });
         },