diff --git a/lib/commands/quota.js b/lib/commands/quota.js
index 74c4eca44..72d04cc68 100644
--- a/lib/commands/quota.js
+++ b/lib/commands/quota.js
@@ -38,6 +38,7 @@ Quota.updateCachedLimits = function (Env, cb) {
     if (Env.adminEmail === false) {
         Quota.applyCustomLimits(Env);
         if (Env.allowSubscriptions === false) { return; }
+        if (Env.blockDailyCheck === true) { return; }
         throw new Error("allowSubscriptions must be false if adminEmail is false");
     }
 
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 1d938ccfd..3a27b228a 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -65,7 +65,9 @@ module.exports.create = function (config, cb) {
         WARN: WARN,
         flushCache: config.flushCache,
         adminEmail: config.adminEmail,
-        allowSubscriptions: config.allowSubscriptions,
+        allowSubscriptions: config.allowSubscriptions === true,
+        blockDailyCheck: config.blockDailyCheck === true,
+
         myDomain: config.httpUnsafeOrigin,
         // XXX not included in the config...
         mySubdomain: config.mySubdomain,