diff --git a/background/storage.js b/background/storage.js
index b57cdf62..60946b32 100644
--- a/background/storage.js
+++ b/background/storage.js
@@ -176,9 +176,11 @@ function getStyles(options) {
     cachedStyles.list = event.target.result || [];
     cachedStyles.byId.clear();
     for (const style of cachedStyles.list) {
-      cachedStyles.byId.set(style.id, style);
-      if (!style.name) {
-        style.name = 'ID: ' + style.id;
+      if (style) {
+        cachedStyles.byId.set(style.id, style);
+        if (!style.name) {
+          style.name = 'ID: ' + style.id;
+        }
       }
     }
 
diff --git a/manage/manage.js b/manage/manage.js
index 01b005f8..6d7e112b 100644
--- a/manage/manage.js
+++ b/manage/manage.js
@@ -116,11 +116,13 @@ function initGlobalEvents() {
 }
 
 function showStyles(styles = [], matchUrlIds) {
-  const sorted = sorter.sort({
-    styles: styles.map(style => ({
-      style,
-      name: style.name.toLocaleLowerCase() + '\n' + style.name,
-    })),
+  const sorted = styles.length
+    ? sorter.sort({
+      styles: styles.map(style => ({
+        style,
+        name: style.name.toLocaleLowerCase() + '\n' + style.name,
+      }))
+    : styles,
   });
   let index = 0;
   let firstRun = true;