diff --git a/lib/commands/quota.js b/lib/commands/quota.js
index 9e1c631d9..5c39a8d93 100644
--- a/lib/commands/quota.js
+++ b/lib/commands/quota.js
@@ -36,7 +36,10 @@ Quota.applyCustomLimits = function (Env) {
 
 Quota.updateCachedLimits = function (Env, cb) {
     Quota.applyCustomLimits(Env);
-    if (Env.allowSubscriptions === false || Env.blockDailyCheck === true) { return void cb(); }
+    if (Env.blockDailyCheck === true ||
+        (typeof(Env.blockDailyCheck) === 'undefined' && Env.adminEmail === false && Env.allowSubscriptions === false)) {
+        return void cb();
+    }
 
     var body = JSON.stringify({
         domain: Env.myDomain,