diff --git a/src/Const.js b/src/Const.js
index 943a5892..5a9292e4 100644
--- a/src/Const.js
+++ b/src/Const.js
@@ -61,9 +61,9 @@ export const InvoiceRegex = /(lnbc\w+)/i;
 /**
  * YouTube URL regex
  */
-export const YoutubeUrlRegex = /^(?:https?:\/\/)?(?:www|m\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/
+export const YoutubeUrlRegex = /(?:https?:\/\/)?(?:www|m\.)?(?:youtu\.be\/|youtube\.com\/(?:shorts\/|embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})/;
 
 /**
  * Hashtag regex
  */
-export const HashtagRegex = /(#[a-z\d-]+)/ig
+export const HashtagRegex = /(#[^\s!@#$%^&*()=+.\/,\[{\]};:'"?><]+)/;