diff --git a/src/components/SearchSuggestions.vue b/src/components/SearchSuggestions.vue
index 794085db..0450a5db 100644
--- a/src/components/SearchSuggestions.vue
+++ b/src/components/SearchSuggestions.vue
@@ -51,11 +51,12 @@ export default {
                 if (this.getPreferenceBoolean("searchHistory", false))
                     this.searchSuggestions = JSON.parse(localStorage.getItem("search_history")) ?? [];
             } else {
-                this.searchSuggestions = (
-                    await this.fetchJson(this.apiUrl() + "/opensearch/suggestions", {
-                        query: this.searchText,
-                    })
-                )?.[1];
+                this.searchSuggestions =
+                    (
+                        await this.fetchJson(this.apiUrl() + "/opensearch/suggestions", {
+                            query: this.searchText,
+                        })
+                    )?.[1] ?? [];
             }
             this.searchSuggestions.unshift(this.searchText);
             this.setSelected(0);
diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue
index f8a25654..0787dd9e 100644
--- a/src/components/VideoPlayer.vue
+++ b/src/components/VideoPlayer.vue
@@ -23,6 +23,7 @@
 
 <script>
 import "shaka-player/dist/controls.css";
+import { parseTimeParam } from "@/utils/Misc";
 const shaka = import("shaka-player/dist/shaka-player.ui.js");
 if (!window.muxjs) {
     import("mux.js").then(muxjs => {
@@ -231,24 +232,7 @@ export default {
             const time = this.$route.query.t ?? this.$route.query.start;
 
             if (time) {
-                let start = 0;
-                if (/^[\d]*$/g.test(time)) {
-                    start = time;
-                } else {
-                    const hours = /([\d]*)h/gi.exec(time)?.[1];
-                    const minutes = /([\d]*)m/gi.exec(time)?.[1];
-                    const seconds = /([\d]*)s/gi.exec(time)?.[1];
-                    if (hours) {
-                        start += parseInt(hours) * 60 * 60;
-                    }
-                    if (minutes) {
-                        start += parseInt(minutes) * 60;
-                    }
-                    if (seconds) {
-                        start += parseInt(seconds);
-                    }
-                }
-                videoEl.currentTime = start;
+                videoEl.currentTime = parseTimeParam(time);
                 this.initialSeekComplete = true;
             } else if (window.db && this.getPreferenceBoolean("watchHistory", false)) {
                 var tx = window.db.transaction("watch_history", "readonly");
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 802647c9..8aaf8e20 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -236,6 +236,7 @@ import PlaylistVideos from "./PlaylistVideos.vue";
 import WatchOnYouTubeButton from "./WatchOnYouTubeButton.vue";
 import LoadingIndicatorPage from "./LoadingIndicatorPage.vue";
 import ToastComponent from "./ToastComponent.vue";
+import { parseTimeParam } from "@/utils/Misc";
 
 export default {
     name: "App",
@@ -540,16 +541,32 @@ export default {
         },
         handleClick(event) {
             if (!event || !event.target) return;
-            var target = event.target;
-            if (
-                !target.nodeName == "A" ||
-                !target.getAttribute("href") ||
-                !target.innerText.match(/(?:[\d]{1,2}:)?(?:[\d]{1,2}):(?:[\d]{1,2})/)
-            )
-                return;
-            const time = parseInt(target.getAttribute("href").match(/(?<=t=)\d+/)[0]);
-            this.navigate(time);
-            event.preventDefault();
+            if (!event.target.matches("a[href]")) return;
+            const target = event.target;
+            if (!target.getAttribute("href")) return;
+            if (this.handleTimestampLinks(target)) {
+                event.preventDefault();
+            }
+        },
+        handleTimestampLinks(target) {
+            try {
+                const url = new URL(target.getAttribute("href"), document.baseURI);
+                if (
+                    url.searchParams.size > 2 ||
+                    url.searchParams.get("v") !== this.getVideoId() ||
+                    !url.searchParams.has("t")
+                ) {
+                    return false;
+                }
+                const time = parseTimeParam(url.searchParams.get("t"));
+                if (time) {
+                    this.navigate(time);
+                }
+                return true;
+            } catch (e) {
+                console.error(e);
+            }
+            return false;
         },
         handleScroll() {
             if (this.loading || !this.comments || !this.comments.nextpage) return;
diff --git a/src/utils/Misc.js b/src/utils/Misc.js
index 7cef8561..13c8cb83 100644
--- a/src/utils/Misc.js
+++ b/src/utils/Misc.js
@@ -6,3 +6,24 @@ export const isEmail = input => {
     );
     return result;
 };
+
+export const parseTimeParam = time => {
+    let start = 0;
+    if (/^[\d]*$/g.test(time)) {
+        start = time;
+    } else {
+        const hours = /([\d]*)h/gi.exec(time)?.[1];
+        const minutes = /([\d]*)m/gi.exec(time)?.[1];
+        const seconds = /([\d]*)s/gi.exec(time)?.[1];
+        if (hours) {
+            start += parseInt(hours) * 60 * 60;
+        }
+        if (minutes) {
+            start += parseInt(minutes) * 60;
+        }
+        if (seconds) {
+            start += parseInt(seconds);
+        }
+    }
+    return start;
+};