diff --git a/shared/editor/embeds/YouTube.test.ts b/shared/editor/embeds/YouTube.test.ts
index 57fecc651..60aebb2f5 100644
--- a/shared/editor/embeds/YouTube.test.ts
+++ b/shared/editor/embeds/YouTube.test.ts
@@ -19,6 +19,10 @@ describe("YouTube", () => {
     expect("https://youtu.be/dQw4w9WgXcQ".match(match)).toBeTruthy();
   });
 
+  test("to be enabled on shortlink with timestamp", () => {
+    expect("https://youtu.be/dQw4w9WgXcQ?t=123".match(match)).toBeTruthy();
+  });
+
   test("to not be enabled elsewhere", () => {
     expect("https://youtu.be".match(match)).toBe(null);
     expect("https://youtube.com".match(match)).toBe(null);
diff --git a/shared/editor/embeds/YouTube.tsx b/shared/editor/embeds/YouTube.tsx
index f39c503cc..d64bd1b25 100644
--- a/shared/editor/embeds/YouTube.tsx
+++ b/shared/editor/embeds/YouTube.tsx
@@ -19,7 +19,7 @@ function YouTube(props: Props) {
 }
 
 YouTube.ENABLED = [
-  /(?:https?:\/\/)?(?:www\.)?youtu\.?be(?:\.com)?\/?.*(?:watch|embed)?(?:.*v=|v\/|\/)([a-zA-Z0-9_-]{11})(?:\?)?(.*)?$/i,
+  /(?:https?:\/\/)?(?:www\.)?youtu\.?be(?:\.com)?\/?.*(?:watch|embed)?(?:.*v=|v\/|\/)([a-zA-Z0-9_-]{11})(?:\?(.*))?$/i,
 ];
 
 export default YouTube;