diff --git a/src/views/apps.html b/src/views/apps.html
index dd6b92060..fa9328938 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -160,12 +160,6 @@
                                   </div>
                                 </div>
 
-                                <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.xFrameOptions.$dirty && appConfigure.error.xFrameOptions }">
-                                    <label class="control-label">Allow embedding from the following site</label>
-                                    <div class="control-label" ng-show="appConfigure.error.xFrameOptions">{{appConfigure.error.xFrameOptions}}</div>
-                                    <input type="text" class="form-control" id="appConfigureXFrameOptionsInput" name="xFrameOptions" placeholder="https://example.com" ng-model="appConfigure.xFrameOptions" uib-tooltip="Leave blank to not allow embedding" tooltip-class="long">
-                                </div>
-
                                 <div ng-hide="true" class="form-group" ng-class="{ 'has-error': !appConfigureForm.dataDir.$dirty && appConfigure.error.dataDir }">
                                     <input type="checkbox" id="appConfigureEnableDataDir" ng-model="appConfigure.dataDirEnabled">
                                     <label class="control-label" for="appConfigureEnableDataDir">Custom Data Directory</label>
diff --git a/src/views/apps.js b/src/views/apps.js
index 4aec20359..b57c5b747 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -39,7 +39,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         mailboxName: '',
         accessRestrictionOption: 'any',
         accessRestriction: { users: [], groups: [] },
-        xFrameOptions: '',
         dataDir: null,
         alternateDomainEnabled: false,
         mailboxNameEnabled: false,
@@ -66,7 +65,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             $scope.appConfigure.domain = $scope.domains.filter(function (d) { return d.domain === app.domain; })[0];
             $scope.appConfigure.portBindingsInfo = angular.extend({}, app.manifest.tcpPorts, app.manifest.udpPorts); // Portbinding map only for information
             $scope.appConfigure.memoryLimit = app.memoryLimit || app.manifest.memoryLimit || (256 * 1024 * 1024);
-            $scope.appConfigure.xFrameOptions = app.xFrameOptions.indexOf('ALLOW-FROM') === 0 ? app.xFrameOptions.split(' ')[1] : '';
             $scope.appConfigure.dataDirEnabled = !!app.dataDir;
             $scope.appConfigure.dataDir = app.dataDir;
             $scope.appConfigure.alternateDomainEnabled = !!app.alternateDomains[0];
@@ -126,7 +124,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
             $scope.appConfigure.busy = true;
             $scope.appConfigure.error.other = null;
             $scope.appConfigure.error.location = null;
-            $scope.appConfigure.error.xFrameOptions = null;
             $scope.appConfigure.error.label = null;
             $scope.appConfigure.error.dataDir = null;
             $scope.appConfigure.error.alternateDomains = null;
@@ -154,7 +151,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 accessRestriction: finalAccessRestriction,
                 cert: $scope.appConfigure.certificateFile,
                 key: $scope.appConfigure.keyFile,
-                xFrameOptions: $scope.appConfigure.xFrameOptions ? ('ALLOW-FROM ' + $scope.appConfigure.xFrameOptions) : 'SAMEORIGIN',
                 memoryLimit: $scope.appConfigure.memoryLimit === $scope.appConfigure.memoryTicks[0] ? 0 : $scope.appConfigure.memoryLimit,
                 robotsTxt: $scope.appConfigure.robotsTxt,
                 enableBackup: $scope.appConfigure.enableBackup,
@@ -203,10 +199,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                         $scope.appConfigure.certificateFile = null;
                         $scope.appConfigure.keyFileName = '';
                         $scope.appConfigure.keyFile = null;
-                    } else if (error.statusCode === 400 && error.message.indexOf('xFrameOptions') !== -1 ) {
-                        $scope.appConfigure.error.xFrameOptions = error.message;
-                        $scope.appConfigureForm.xFrameOptions.$setPristine();
-                        $('#appConfigureXFrameOptionsInput').focus();
                     } else if (error.statusCode === 400 && error.message.indexOf('alternateDomains') !== -1 ) {
                         $scope.appConfigure.error.alternateDomains = error.message;
                         $scope.appConfigureForm.alternateDomains.$setPristine();
@@ -452,7 +444,6 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         $scope.appConfigure.memoryTicks = [];
         $scope.appConfigure.accessRestrictionOption = 'any';
         $scope.appConfigure.accessRestriction = { users: [], groups: [] };
-        $scope.appConfigure.xFrameOptions = '';
         $scope.appConfigure.ssoAuth = false;
         $scope.appConfigure.robotsTxt = '';
         $scope.appConfigure.enableBackup = true;