diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index c4702727d..130926e6a 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -2159,6 +2159,8 @@ define([
             if (!data.channel) { return void cb({ error: 'ENOTFOUND'}); }
             if (!data.command) { return void cb({ error: 'EINVAL' }); }
             var s = getStore(data.teamId);
+            if (!s) { return void cb({ error: 'ENOTFOUND' }); }
+
             var otherChannels = data.channels;
             delete data.channels;
             s.rpc.setMetadata(data, function (err, res) {