diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index 410d34a01..c97d02ba2 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -202,10 +202,6 @@ export class Common {
 
   /** Decodes a channel id returned by lnd as uint64 to a short channel id */
   static channelIntegerIdToShortId(id: string): string {
-    if (config.LIGHTNING.BACKEND === 'cln') {
-      return id;
-    }
-
     const n = BigInt(id);
     return [
       n >> 40n, // nth block
diff --git a/backend/src/api/explorer/channels.api.ts b/backend/src/api/explorer/channels.api.ts
index 55043197d..072449d60 100644
--- a/backend/src/api/explorer/channels.api.ts
+++ b/backend/src/api/explorer/channels.api.ts
@@ -420,7 +420,7 @@ class ChannelsApi {
       const result = await DB.query<ResultSetHeader>(`
         UPDATE channels
         SET status = 0
-        WHERE short_id NOT IN (
+        WHERE id NOT IN (
           ${graphChannelsIds.map(id => `"${id}"`).join(',')}
         )
         AND status != 2
diff --git a/backend/src/api/lightning/clightning/clightning-convert.ts b/backend/src/api/lightning/clightning/clightning-convert.ts
index 5df51aadc..2bdde31d3 100644
--- a/backend/src/api/lightning/clightning/clightning-convert.ts
+++ b/backend/src/api/lightning/clightning/clightning-convert.ts
@@ -90,7 +90,7 @@ async function buildFullChannel(clChannelA: any, clChannelB: any): Promise<ILigh
   const outputIdx = parts[2];
 
   return {
-    channel_id: clChannelA.short_channel_id,
+    channel_id: convertChannelId(clChannelA.short_channel_id),
     capacity: clChannelA.satoshis,
     last_update: lastUpdate,
     node1_policy: convertPolicy(clChannelA),
@@ -111,7 +111,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
   const outputIdx = parts[2];
 
   return {
-    channel_id: clChannel.short_channel_id,
+    channel_id: convertChannelId(clChannel.short_channel_id),
     capacity: clChannel.satoshis,
     last_update: clChannel.last_update ?? 0,
     node1_policy: convertPolicy(clChannel),