diff --git a/app/components/Bulletin.tsx b/app/components/Bulletin.tsx
index 6e437d6..798c690 100644
--- a/app/components/Bulletin.tsx
+++ b/app/components/Bulletin.tsx
@@ -29,10 +29,10 @@ export function Bulletin(props: { routes: Record<string, Route>; stop: Stop; wal
               return vehicle.minutes_until_arrival > props.walk_time / 2;
             });
 
-            return (
+            return times.length > 0 ? (
               <div
                 className="flex min-h-29 flex-row items-center rounded-lg bg-slate-200 text-black"
-                key={Math.random()}
+                key={times[0].route_id + "_" + times[0].destination_id}
               >
                 <div className="flex min-h-full basis-5/6 flex-row items-center rounded-lg bg-slate-100 shadow-2xl">
                   <div className="flex min-h-full basis-4/5 flex-row items-center justify-start gap-2 px-2">
@@ -54,7 +54,7 @@ export function Bulletin(props: { routes: Record<string, Route>; stop: Stop; wal
                   ) : undefined}
                 </div>
               </div>
-            );
+            ) : undefined;
           });
         })
       ) : (
diff --git a/app/components/Message.tsx b/app/components/Message.tsx
index 4cb8adf..214a5e3 100644
--- a/app/components/Message.tsx
+++ b/app/components/Message.tsx
@@ -17,11 +17,11 @@ export function Message(props: { routes: Record<string, Route>; name: string; he
       {props.headers.length > 0 ? (
         <div className="flex min-h-62 flex-row items-start rounded-lg bg-slate-100 px-4">
           <h1 className="line-clamp-4 text-pretty font-semibold 2xl:text-5xl 2xl:leading-tight">
-            {props.headers[props.index].split(/(\[.*?\])/).map((text) => {
+            {props.headers[props.index].split(/(\[.*?\])/).map((text, index) => {
               if (text.length == 0) return;
               if (text.substring(0, 1) != "[" || text.substring(text.length - 1) != "]") return text;
               return (
-                <div className="mx-1 inline-flex -translate-y-1.5" key={Math.random()}>
+                <div className="mx-1 inline-flex -translate-y-1.5" key={index}>
                   <Bullet route={props.routes[text.substring(1, text.length - 1)]} size={42} />
                 </div>
               );
diff --git a/app/page.tsx b/app/page.tsx
index 458b0a0..b69a9fc 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -112,7 +112,7 @@ export default function Home() {
             {Object.values(config.subway).map((value) => {
               return (
                 <Countdown
-                  key={Math.random()}
+                  key={value.stop_ids[0]}
                   stop={stops[value.stop_ids[0]]}
                   walk_time={value.walk_time}
                   routes={routes}
@@ -129,7 +129,7 @@ export default function Home() {
             {Object.values(config.bus).map((value) => {
               return (
                 <Bulletin
-                  key={Math.random()}
+                  key={value.stop_ids[0]}
                   stop={stops[value.stop_ids[0]]}
                   routes={routes}
                   walk_time={value.walk_time}