diff --git a/components/Apps/WebView.tsx b/components/Apps/WebView.tsx
index 1ea920d..0488fef 100644
--- a/components/Apps/WebView.tsx
+++ b/components/Apps/WebView.tsx
@@ -144,7 +144,9 @@ export const AppsWebView = ({ openStationACFromEachTrainInfo }) => {
       favoriteStation[0][0].StationNumber
     );
     if (!string) return () => {};
-    webview?.current.injectJavaScript(string);
+    setTimeout(() => {
+      webview?.current?.injectJavaScript(string);
+    }, 500);
     once = true;
   };
 
diff --git a/components/StationDiagram/ListViewItem.tsx b/components/StationDiagram/ListViewItem.tsx
index 3340db0..7a3b3d4 100644
--- a/components/StationDiagram/ListViewItem.tsx
+++ b/components/StationDiagram/ListViewItem.tsx
@@ -58,7 +58,8 @@ export const ListViewItem: FC<{
     priority,
     uwasa,
     vehicleFormation,
-    trainInfoUrl,lineColor
+    trainInfoUrl,lineColor,
+    trainNumberOverride
   ] = useMemo(() => {
     const {
       type,
@@ -69,6 +70,7 @@ export const ListViewItem: FC<{
       train_info_url,
       to_data,
       to_data_color,
+      train_number_override,
     } = customTrainDataDetector(d.trainNumber, allCustomTrainData);
     const [typeString, fontAvailable, isOneMan] = getStringConfig(
       type,
@@ -109,7 +111,8 @@ export const ListViewItem: FC<{
         uwasa,
         vehicle_formation,
         train_info_url,
-        finalColor
+        finalColor,
+        train_number_override
       ];
     }
     
@@ -125,7 +128,8 @@ export const ListViewItem: FC<{
           uwasa,
           vehicle_formation,
           train_info_url,
-          finalColor
+          finalColor,
+          train_number_override
         ];
       default:
         // 行先がある場合は、行先を取得
@@ -141,7 +145,8 @@ export const ListViewItem: FC<{
           uwasa,
           vehicle_formation,
           train_info_url,
-          finalColor
+          finalColor,
+          train_number_override
         ];
     }
   }, [d.array, allCustomTrainData]);
@@ -217,7 +222,7 @@ export const ListViewItem: FC<{
         sources.push({ label: "運用", text: unitIds.join("・"), badgeColor: "#00BCD4", textColor: isDark ? "#4dd0e1" : "#006064" });
       }
     }
-    const unyoText = getUnyohubByTrainNumber?.(d.trainNumber);
+    const unyoText = getUnyohubByTrainNumber?.(trainNumberOverride || d.trainNumber);
     if (unyoText) {
       sources.push({ label: "Hub", text: unyoText, badgeColor: "#9E9E9E", textColor: isDark ? "#cccccc" : "#424242" });
     }
diff --git a/lib/webViewInjectjavascript.ts b/lib/webViewInjectjavascript.ts
index 33b34dc..bf93047 100644
--- a/lib/webViewInjectjavascript.ts
+++ b/lib/webViewInjectjavascript.ts
@@ -817,9 +817,10 @@ export const injectJavascriptData = ({
       }
 
       const optionalTextColor = optionalText.includes("最終") ? "red" : "black";
-      const unyohubFormation = getUnyohubFormation(列番データ);
+      const unyohubLookupNum = TrainNumberOverride || 列番データ;
+      const unyohubFormation = getUnyohubFormation(unyohubLookupNum);
       const hasUnyohub = unyohubFormation !== null;
-      const unyohubStale = hasUnyohub && isUnyohubStale(列番データ);
+      const unyohubStale = hasUnyohub && isUnyohubStale(unyohubLookupNum);
       if(hasUnyohub) {
         console.log('[UnyoHub] Badge shown for', 列番データ, ':', unyohubFormation, unyohubStale ? '(stale)' : '');
       }
@@ -861,7 +862,7 @@ export const injectJavascriptData = ({
         badgeHtml += "<div style='position:absolute;" + badgePosition + ":0;" + offsetStyle + "background-color:#44bb44;border-radius:50%;border:1px solid #228822;width:19px;height:19px;box-sizing:border-box;display:flex;align-items:center;justify-content:center;'><span style='color:white;font-size:10px;font-weight:bold;line-height:1;'>E</span></div>";
       }
       
-      行き先情報.insertAdjacentHTML('beforebegin', "<div style='width:100%;display:flex;flex:1;flex-direction:"+(isLeft ? "column-reverse" : "column") + ";font-weight:bold;'>" + badgeHtml + "<p style='font-size:6px;padding:0;color:black;text-align:center;'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p><div style='flex:1;'></div><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + (isWanman ? "ワンマン " : "") + "</p><p style='font-size:6px;font-weight:bold;padding:0;color:black;text-align:center;border-style:solid;border-width: "+(!!yosan2Color ? "2px" : "0px")+";border-color:" + yosan2Color + "'>" + viaData + "</p><p style='font-size:6px;font-weight:bold;padding:0;color: " + optionalTextColor + ";text-align:center;'>" + optionalText + "</p><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + trainName + "</p><div style='width:100%;background:" + gradient + ";'><p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:white;align-items:center;align-content:center;text-align:center;text-shadow:1px 1px 0px #00000030, -1px -1px 0px #00000030,-1px 1px 0px #00000030,  1px -1px 0px #00000030,1px 0px 0px #00000030, -1px  0px 0px #00000030,0px 1px 0px #00000030,  0px -1px 0px #00000030;'>" + (ToData ? ToData + "行" : ToData) + "</p></div><div style='width:100%;background:" + trainTypeColor + ";border-radius:"+(isLeft ? "4px 4px 0 0" : "0 0 4px 4px")+";'><p style='font-size:10px;font-weight:bold;font-style:italic;padding:0;color: white;text-align:center;'>" + trainType + "</p></div><p style='font-size:8px;font-weight:bold;padding:0;text-align:center;color: "+(hasProblem ? "red": "black")+"; "+(hasProblem ? "animation:_jrs_blink 3s linear infinite;" : "")+"'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p></div>");
+      行き先情報.insertAdjacentHTML('beforebegin', "<div style='width:100%;display:flex;flex:1;flex-direction:"+(isLeft ? "column-reverse" : "column") + ";font-weight:bold;'>" + badgeHtml + "<p style='font-size:6px;padding:0;color:black;text-align:center;'>" + (TrainNumberOverride ? TrainNumberOverride : TrainNumber) + "</p><div style='flex:1;'></div><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + (isWanman ? "ワンマン " : "") + "</p><p style='font-size:6px;font-weight:bold;padding:0;color:black;text-align:center;border-style:solid;border-width: "+(!!yosan2Color ? "2px" : "0px")+";border-color:" + yosan2Color + "'>" + viaData + "</p><p style='font-size:8px;font-weight:bold;padding:0;color: " + optionalTextColor + ";text-align:center;'>" + optionalText + "</p><p style='font-size:8px;font-weight:bold;padding:0;color:black;text-align:center;'>" + trainName + "</p><div style='width:100%;background:" + gradient + ";'><p style='font-size:10px;font-weight:bold;padding:0;margin:0;color:white;align-items:center;align-content:center;text-align:center;text-shadow:1px 1px 0px #00000030, -1px -1px 0px #00000030,-1px 1px 0px #00000030,  1px -1px 0px #00000030,1px 0px 0px #00000030, -1px  0px 0px #00000030,0px 1px 0px #00000030,  0px -1px 0px #00000030;'>" + (ToData ? ToData + "行" : ToData) + "</p></div><div style='width:100%;background:" + trainTypeColor + ";border-radius:"+(isLeft ? "4px 4px 0 0" : "0 0 4px 4px")+";'><p style='font-size:10px;font-weight:bold;font-style:italic;padding:0;color: white;text-align:center;'>" + trainType + "</p></div><p style='font-size:8px;font-weight:bold;padding:0;text-align:center;color: "+(hasProblem ? "red": "black")+"; "+(hasProblem ? "animation:_jrs_blink 3s linear infinite;" : "")+"'>" + (hasProblem ? "‼️停止中‼️" : "") + "</p></div>");
 `: `
       var _defTextColor = _isDark ? 'white' : 'black';
       行き先情報.insertAdjacentHTML('beforebegin', "<p style='font-size:10px;font-weight:bold;padding:0;color:" + _defTextColor + ";'>" + returnText1 + "</p>");
diff --git a/stateBox/useStationList.tsx b/stateBox/useStationList.tsx
index ba5f5fc..36533c8 100644
--- a/stateBox/useStationList.tsx
+++ b/stateBox/useStationList.tsx
@@ -152,7 +152,9 @@ export const StationListProvider: FC<Props> = ({ children }) => {
       }
     });
     if (bootStationList[0] === undefined) return "";
-    return `MoveDisplayStation('${bootStationList[0].line}_${bootStationList[0].station.MyStation}_${bootStationList[0].station.Station_JP}');document.getElementById("disp").insertAdjacentHTML("afterbegin", "<div />");var pos = $("#stationBlock${bootStationList[0].station.Station_JP}").offset().top;window.scrollTo(0, pos * 0.98 - ${offset} - ${fixedData});`;
+    const lineKey = `${bootStationList[0].line}_${bootStationList[0].station.MyStation}_${bootStationList[0].station.Station_JP}`;
+    const stationBlockId = `stationBlock${bootStationList[0].station.Station_JP}`;
+    return `MoveDisplayStation('${lineKey}');document.getElementById("disp").insertAdjacentHTML("afterbegin", "<div />");(function(){var lastH=0,stable=0;var iv=setInterval(function(){var h=document.body.scrollHeight;if(h===lastH){stable++;}else{stable=0;}lastH=h;if(stable>=3){clearInterval(iv);var el=document.getElementById("${stationBlockId}")||$("#${stationBlockId}")[0];if(el){var pos=$("#${stationBlockId}").offset().top;window.scrollTo(0,pos*0.98-${offset}-${fixedData});}}},50);})();`;
   };
 
   return (