diff --git a/panels/hassio/addon-store/hassio-addon-store-overview.html b/panels/hassio/addon-store/hassio-addon-store-overview.html
index 41e2c575de..57f8608adc 100644
--- a/panels/hassio/addon-store/hassio-addon-store-overview.html
+++ b/panels/hassio/addon-store/hassio-addon-store-overview.html
@@ -41,7 +41,7 @@
       <div class='content'>
         <hassio-repositories-editor
           hass='[[hass]]'
-          repos='[[supervisorInfo.addons_repositories]]'
+          repos='[[repos]]'
         ></hassio-repositories-editor>
         <template is='dom-repeat' items='[[repos]]' as='repo'>
           <hassio-addon-repository
@@ -77,7 +77,6 @@ Polymer({
 
     repos: {
       type: Array,
-      value: []
     },
 
     supervisorInfo: {
diff --git a/panels/hassio/addon-store/hassio-repositories-editor.html b/panels/hassio/addon-store/hassio-repositories-editor.html
index 06d21d0af3..1717898b33 100644
--- a/panels/hassio/addon-store/hassio-repositories-editor.html
+++ b/panels/hassio/addon-store/hassio-repositories-editor.html
@@ -49,13 +49,15 @@ Polymer({
 
     repos: {
       type: Array,
-      value: [],
       observer: 'reposChanged',
     },
   },
 
   reposChanged: function (repos) {
-    this.options = repos.join('\n');
+    this.options = repos
+      .filter(function (el) { return el.source !== null; })
+      .map(function (el) { return el.source; })
+      .join('\n');
   },
 
   computeOptionsData: function (options) {