diff --git a/src/views/app.html b/src/views/app.html
index d2213620c..b1ee38c22 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -438,17 +438,16 @@
         <hr/>
         <div class="row">
           <div class="col-md-12">
+            <label class="control-label" for="resourcesEnableDataDir">Custom Data Directory <sup><a ng-href="{{ config.webServerOrigin }}/documentation/storage/#moving-a-single-apps-data-directory-to-another-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+            <p>
+              By default, this app's data is located at <code>/home/yellowtent/appsdata/{{ app.id }}</code>. If the server is running out of disk space,
+              you can mount an external disk and move this app's data there.
+            </p>
             <fieldset>
               <form role="form" name="resourcesDataDirForm" ng-submit="resources.submitDataDir()" autocomplete="off">
-                <div class="form-group">
-                  <input type="checkbox" id="resourcesEnableDataDir" ng-model="resources.dataDirEnabled">
-                  <label class="control-label" for="resourcesEnableDataDir">Custom Data Directory <sup><a ng-href="{{ config.webServerOrigin }}/documentation/storage/#moving-a-single-apps-data-directory-to-another-location" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
-                  <p>
-                    By default, this app's data is located at <code>/home/yellowtent/appsdata/{{ app.id }}</code>. If the server is running out of disk space,
-                    you can mount an external disk and move this app's data there.
-                  </p>
-                  <div ng-class="{ 'has-error': resourcesDataDirForm.$dirty && resources.error.dataDir }" ng-show="resources.error.dataDir">{{ resources.error.dataDir }}</div>
-                  <input type="text" class="form-control" name="dataDir" ng-disabled="!resources.dataDirEnabled" placeholder="/mnt/appdata" ng-model="resources.dataDir" ng-required="resources.dataDirEnabled">
+                <div class="form-group" ng-class="{ 'has-error': resourcesDataDirForm.$dirty && resources.error.dataDir }">
+                  <div ng-show="resources.error.dataDir">{{ resources.error.dataDir }}</div>
+                  <input type="text" class="form-control" name="dataDir" placeholder="Leave empty to use platform default" ng-model="resources.dataDir">
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir"/>
diff --git a/src/views/app.js b/src/views/app.js
index dd64c15ce..ed437b0d1 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -306,8 +306,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         memoryLimit: 0,
         memoryTicks: [],
         dataDir: null,
-        currentDataDirEnabled: false,
-        dataDirEnabled: false,
 
         show: function () {
             var app = $scope.app;
@@ -315,8 +313,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.resources.error = {};
             $scope.resources.currentMemoryLimit = app.memoryLimit || app.manifest.memoryLimit || (256 * 1024 * 1024);
             $scope.resources.memoryLimit = $scope.resources.currentMemoryLimit;
-            $scope.resources.dataDirEnabled = !!app.dataDir;
-            $scope.resources.currentDataDirEnabled = $scope.resources.dataDirEnabled
             $scope.resources.dataDir = app.dataDir;
 
             // create ticks starting from manifest memory limit. the memory limit here is currently split into ram+swap (and thus *2 below)
@@ -350,7 +346,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.resources.busyDataDir = true;
             $scope.resources.error = {};
 
-            Client.configureApp($scope.app.id, 'data_dir', { dataDir: $scope.resources.dataDirEnabled ? $scope.resources.dataDir : null }, function (error) {
+            Client.configureApp($scope.app.id, 'data_dir', { dataDir: $scope.resources.dataDir || null }, function (error) {
                 if (error && error.statusCode === 400) {
                     $scope.resources.error.dataDir = error.message;
                     $scope.resources.busyDataDir = false;
@@ -358,7 +354,6 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 }
                 if (error) return Client.error(error);
 
-                $scope.resources.currentDataDirEnabled = $scope.resources.dataDirEnabled;
                 $scope.resourcesDataDirForm.$setPristine();
                 $scope.resources.busyDataDir = false;