diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index f36c2e439..00759d71b 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -102,7 +102,7 @@
                         <label class="control-label hand" data-toggle="collapse" data-target="#appConfigureCollapseAdvanced">Show advanced</label>
                         <div class="collapse" id="appConfigureCollapseAdvanced">
                             <div class="form-group">
-                                <label class="control-label" for="memoryLimit">Maximum Memory Usage: <b>{{ appConfigure.memoryLimit / 1024 / 1024 }} MB</b></label>
+                                <label class="control-label" for="memoryLimit">Maximum Memory Usage: <b>{{ appConfigure.memoryLimit ? appConfigure.memoryLimit / 1024 / 1024 + 'MB' : 'Default' }}</b></label>
                                 <br/>
                                 <div style="padding: 0 10px;">
                                     <slider id="memoryLimit" ng-model="appConfigure.memoryLimit" step="33554432" tooltip="hide" ticks="memoryTicks" ticks-snap-bounds="67108864"></slider>
diff --git a/webadmin/src/views/apps.js b/webadmin/src/views/apps.js
index f1af8b304..60bbc2892 100644
--- a/webadmin/src/views/apps.js
+++ b/webadmin/src/views/apps.js
@@ -11,6 +11,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
     $scope.users = [];
 
     $scope.memoryTicks = [
+        0, // result to default memory limit
         256 * 1024 * 1024,
         512 * 1024 * 1024,
         1024 * 1024 * 1024,
@@ -179,7 +180,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.portBindingsInfo = app.manifest.tcpPorts || {}; // Portbinding map only for information
         $scope.appConfigure.accessRestrictionOption = app.accessRestriction ? 'restricted' : '';
         $scope.appConfigure.accessRestriction = app.accessRestriction || { users: [], groups: [] };
-        $scope.appConfigure.memoryLimit = app.memoryLimit || 256;
+        $scope.appConfigure.memoryLimit = app.memoryLimit;
         $scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
 
         // fill the portBinding structures. There might be holes in the app.portBindings, which signalizes a disabled port