diff --git a/launcher/src/backend/web3/CSM.js b/launcher/src/backend/web3/CSM.js
index 0d4fc2f1c..d2d947a0b 100644
--- a/launcher/src/backend/web3/CSM.js
+++ b/launcher/src/backend/web3/CSM.js
@@ -418,7 +418,4 @@ async function checkSigningKeys(keysArray, monitoring) {
   }
 }
 
-export default {
-  checkSigningKeys,
-  getSigningKeysWithQueueInfo,
-};
+export { checkSigningKeys, getSigningKeysWithQueueInfo };
diff --git a/launcher/src/composables/validators.js b/launcher/src/composables/validators.js
index d74513b37..a30c23c59 100644
--- a/launcher/src/composables/validators.js
+++ b/launcher/src/composables/validators.js
@@ -141,13 +141,13 @@ export async function useUpdateValidatorStats() {
     return;
   }
   // Get queue keys
-  const keysInQueue = await ControlService.getCSMQueue(stakingStore.keys.map((key) => key.key));
+  const keysInQueue = await ControlService.getSigningKeysWithQueueInfo();
   stakingStore.keys.forEach((key) => {
     let info = data.find((k) => k.pubkey === key.key);
 
     // Check if the key is in queue here
     let inQueue = false;
-    if (Array.isArray(keysInQueue)) inQueue = keysInQueue.includes(key.key);
+    if (Array.isArray(keysInQueue)) inQueue = keysInQueue.some((k) => k.key === key.key && k.queuePosition != 0);
 
     if (info) {
       let dateActive = new Date();
diff --git a/launcher/src/storageservice.js b/launcher/src/storageservice.js
index 6540c0cc7..8bcbc2334 100755
--- a/launcher/src/storageservice.js
+++ b/launcher/src/storageservice.js
@@ -10,7 +10,6 @@ export class StorageService {
   async writeConfig(config) {
     try {
       this.store.set("config-v2", config);
-      log.info("Config written:", config);
     } catch (error) {
       log.error("Error writing config:", error);
     }
@@ -19,7 +18,6 @@ export class StorageService {
   async readConfig() {
     try {
       const config = this.store.get("config-v2");
-      log.info("Config read:", config);
       return new Promise((resolve) => resolve(config));
     } catch (error) {
       log.error("Error reading config:", error);