diff --git a/panels/hassio/addon-store/hassio-repositories-editor.html b/panels/hassio/addon-store/hassio-repositories-editor.html
index 35f70726ee..a151f67657 100644
--- a/panels/hassio/addon-store/hassio-repositories-editor.html
+++ b/panels/hassio/addon-store/hassio-repositories-editor.html
@@ -59,8 +59,11 @@ Polymer({
   },
 
   computeOptionsData: function (options) {
+    var parsed = options.trim();
+    parsed = parsed ?
+      parsed.split("\n").map(function(ent) { return ent.trim(); }) : [];
     return {
-      addons_repositories: options.split('\n'),
+      addons_repositories: parsed,
     };
   },
 });