diff --git a/src/flux/stores/metadata-store.es6 b/src/flux/stores/metadata-store.es6
index caef3563a..5dc8bc031 100644
--- a/src/flux/stores/metadata-store.es6
+++ b/src/flux/stores/metadata-store.es6
@@ -24,7 +24,7 @@ class MetadataStore extends NylasStore {
       return (
         t.modelify(modelClass, _.pluck(models, 'clientId'))
         .then((latestModels)=> {
-          const updatedModels = latestModels.map(m => m.applyPluginMetadata(pluginId, metadataValue));
+          const updatedModels = _.compact(latestModels).map(m => m.applyPluginMetadata(pluginId, metadataValue));
           return (
             t.persistModels(updatedModels)
             .then(()=> Promise.resolve(updatedModels))