diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 6ed0923..1c46a13 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -804,7 +804,7 @@ import { buildPopup as _buildPopup } from "./popup";
                 detail = '<span class="dist">' + escapeHtml(loc) + "</span>";
             }
             item.innerHTML =
-                '<a class="callsign" href="https://brandmeister.network/?page=repeater&id=' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + "</a>" +
+                '<a class="callsign" href="https://brandmeister.network/#/device/' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + "</a>" +
                 '<span class="freq" style="color:' + bandColor + '">' + r.freq_tx.toFixed(4) + "</span>" +
                 detail;
             item.addEventListener("click", function (e) {
diff --git a/frontend/src/popup.test.ts b/frontend/src/popup.test.ts
index 3616926..c91d998 100644
--- a/frontend/src/popup.test.ts
+++ b/frontend/src/popup.test.ts
@@ -20,7 +20,7 @@ describe("buildPopup", () => {
     it("contains callsign as a link", () => {
         const html = buildPopup(makeRepeater(), mockT);
         expect(html).toContain("DB0ABC");
-        expect(html).toContain("brandmeister.network/?page=repeater&id=1");
+        expect(html).toContain("brandmeister.network/#/device/1");
     });
 
     it("contains TX and RX frequencies", () => {
diff --git a/frontend/src/popup.ts b/frontend/src/popup.ts
index 09831a6..ff1f4a3 100644
--- a/frontend/src/popup.ts
+++ b/frontend/src/popup.ts
@@ -5,7 +5,7 @@ import { escapeHtml } from "./format";
 export function buildPopup(r: Repeater, t: TranslateFunction): string {
     const bandClass = r.band === "2m" ? "band-2m" : "band-70cm";
     let html = '<div class="rptr-popup">';
-    html += '<h3><a href="https://brandmeister.network/?page=repeater&id=' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + '</a> <span class="band-tag ' + bandClass + '">' + escapeHtml(r.band) + "</span></h3>";
+    html += '<h3><a href="https://brandmeister.network/#/device/' + r.id + '" target="_blank" rel="noopener">' + escapeHtml(r.callsign) + '</a> <span class="band-tag ' + bandClass + '">' + escapeHtml(r.band) + "</span></h3>";
     html += "<table>";
     html += "<tr><td>" + t("popup_tx") + "</td><td>" + r.freq_tx.toFixed(4) + " MHz</td></tr>";
     if (r.freq_rx)