diff --git a/src/components/HTMLPreview.svelte b/src/components/HTMLPreview.svelte
index 99f8a764e..9fd21cd9a 100644
--- a/src/components/HTMLPreview.svelte
+++ b/src/components/HTMLPreview.svelte
@@ -73,8 +73,8 @@
     },
     {
       name: 'replaced_by',
-      type: 'channel',
-      value: data._replaced_by ? data._replaced_by.name : null
+      type: 'string',
+      value: data.replaced_by
     },
     { name: 'website', type: 'external_link', value: data.website }
   ].filter(f => (Array.isArray(f.value) ? f.value.length : f.value))
diff --git a/src/store.js b/src/store.js
index aac726eb0..a678f112b 100644
--- a/src/store.js
+++ b/src/store.js
@@ -33,7 +33,7 @@ export async function fetchChannels() {
 
   countries.set(api.countries)
 
-  let _channels = Object.values(api.channels).map(c => transformChannel(c, api))
+  let _channels = api.channels.map(c => transformChannel(c, api))
 
   channels.set(_channels)
   filteredChannels.set(_channels)
@@ -134,7 +134,6 @@ async function loadAPI() {
   api.channels = await fetch('https://iptv-org.github.io/api/channels.json')
     .then(r => r.json())
     .then(data => (data.length ? data : []))
-    .then(data => _.keyBy(data, channel => channel.id.toLowerCase()))
     .catch(err => {
       console.error(err)
       return []
@@ -163,7 +162,6 @@ export function transformChannel(channel, data) {
   channel.is_closed = !!channel.closed || !!channel.replaced_by
   channel.is_blocked = !!data.blocklist[channel.id]
   channel.streams = channel._streams.length
-  channel._replaced_by = channel.replaced_by ? data.channels[channel.replaced_by.toLowerCase()] : {}
 
   return channel
 }