diff --git a/src/store/modules/episodes.js b/src/store/modules/episodes.js
index d7a6bdc1f..b6db9c859 100644
--- a/src/store/modules/episodes.js
+++ b/src/store/modules/episodes.js
@@ -78,7 +78,7 @@ const helpers = {
       assetTypes: [],
       taskTypes,
       taskStatuses,
-      descriptors: production.descriptors,
+      descriptors: production?.descriptors || [],
       persons,
       query
     })
diff --git a/src/store/modules/sequences.js b/src/store/modules/sequences.js
index 8179fafbe..484a40af6 100644
--- a/src/store/modules/sequences.js
+++ b/src/store/modules/sequences.js
@@ -86,7 +86,7 @@ const helpers = {
       assetTypes: [],
       taskTypes,
       taskStatuses,
-      descriptors: production.descriptors,
+      descriptors: production?.descriptors || [],
       persons,
       query
     })
diff --git a/src/store/modules/shots.js b/src/store/modules/shots.js
index 32105027c..754524424 100644
--- a/src/store/modules/shots.js
+++ b/src/store/modules/shots.js
@@ -225,7 +225,7 @@ const helpers = {
       assetTypes: [],
       taskTypes,
       taskStatuses,
-      descriptors: production.descriptors,
+      descriptors: production?.descriptors || [],
       persons,
       query
     })