diff --git a/lib/commands/metadata.js b/lib/commands/metadata.js
index d21b7103c..896c89f31 100644
--- a/lib/commands/metadata.js
+++ b/lib/commands/metadata.js
@@ -19,7 +19,7 @@ Data.getMetadataRaw = function (Env, channel /* channelName */, _cb) {
 
     Env.batchMetadata(channel, cb, function (done) {
         Env.computeMetadata(channel, function (err, meta) {
-            if (!err && meta && meta.channel) {
+            if (!err && HK.isMetadataMessage(meta)) {
                 Env.metadata_cache[channel] = meta;
                 // clear metadata after a delay if nobody has joined the channel within 30s
                 Env.checkCache(channel);