diff --git a/common/script/content/index.coffee b/common/script/content/index.coffee
index 2cefefec09..d4348049ee 100644
--- a/common/script/content/index.coffee
+++ b/common/script/content/index.coffee
@@ -30,7 +30,6 @@ api.gear =
 ###
   Time Traveler Store, mystery sets need their items mapped in
 ###
-_.each api.mystery, (v,k)-> v.items = _.where api.gear.flat, {mystery:k}
 
 api.timeTravelerStore = require('../../dist/scripts/content/time-traveler-store')
 
diff --git a/common/script/src/content/mystery-sets.js b/common/script/src/content/mystery-sets.js
index c39b5fd67b..684d93cf1e 100644
--- a/common/script/src/content/mystery-sets.js
+++ b/common/script/src/content/mystery-sets.js
@@ -1,4 +1,5 @@
-import {each} from 'lodash';
+import {each, where} from 'lodash';
+import {flat as flattenedGear} from './gear/index';
 
 let mysterySets = {
   201402: {
@@ -114,6 +115,9 @@ let mysterySets = {
 
 each(mysterySets, (objectSet, name) => {
   objectSet.key = name;
+  objectSet.items = where(flattenedGear, {
+    mystery: name
+  });
 });
 
 export default mysterySets;