diff --git a/src/views/email.html b/src/views/email.html
index 2b56de3de..060cc2b50 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -16,17 +16,10 @@
           <br/><br/>
           If this domain is already configured to handle email with some other provider, it will overwrite those records.
         </div>
-        <div ng-hide="hasSubscription">
-          <br/>
-          <div class="text-danger">
-            A paid subscription is required to enable the Email Solution.
-          </div>
-        </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
         <button type="button" class="btn btn-success" ng-show="hasSubscription" ng-click="enableEmail()">I understand, enable</button>
-        <a class="btn btn-success" ng-hide="hasSubscription" ng-click="closeEnableEmailDialog()" ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?view=subscriptions&email=' + appstoreConfig.profile.emailEncoded + '&cloudronId=' + appstoreConfig.cloudronId }}" target="_blank">Setup Subscription</a>
       </div>
     </div>
   </div>
diff --git a/src/views/email.js b/src/views/email.js
index 9752c9bdd..d5b46f4f5 100644
--- a/src/views/email.js
+++ b/src/views/email.js
@@ -2,7 +2,7 @@
 
 /* global asyncForEach:false */
 
-angular.module('Application').controller('EmailController', ['$scope', '$location', '$timeout', '$rootScope', 'Client', 'AppStore', function ($scope, $location, $timeout, $rootScope, Client, AppStore) {
+angular.module('Application').controller('EmailController', ['$scope', '$location', '$timeout', '$rootScope', 'Client', function ($scope, $location, $timeout, $rootScope, Client) {
     Client.onReady(function () { if (!Client.hasScope('mail')) $location.path('/'); });
 
     $scope.ready = false;
@@ -10,7 +10,6 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
     $scope.client = Client;
     $scope.user = Client.getUserInfo();
     $scope.config = Client.getConfig();
-    $scope.hasSubscription = false;
     $scope.domains = [];
     $scope.users = [];
     $scope.selectedDomain = null;
@@ -196,18 +195,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
         if ($scope.selectedDomain.mailConfig.enabled) {
             $('#disableEmailModal').modal('show');
         } else {
-            Client.getAppstoreConfig(function (error, appstoreConfig) {
-                if (error) return console.error(error);
-                if (!appstoreConfig.token) return;
-
-                AppStore.getSubscription(appstoreConfig, function (error, result) {
-                    if (error) return console.error(error);
-
-                    $scope.hasSubscription = result.plan.id !== 'free';
-
-                    $('#enableEmailModal').modal('show');
-                });
-            });
+            $('#enableEmailModal').modal('show');
         }
     };