diff --git a/platypush/plugins/video/omxplayer.py b/platypush/plugins/video/omxplayer.py
index 512e4e3da..c0a181a30 100644
--- a/platypush/plugins/video/omxplayer.py
+++ b/platypush/plugins/video/omxplayer.py
@@ -136,7 +136,7 @@ class VideoOmxplayerPlugin(Plugin):
         results = []
 
         for vid in soup.findAll(attrs={'class':'yt-uix-tile-link'}):
-            m = re.match('(/watch\?v=.+)&?', vid['href'])
+            m = re.match('(/watch\?v=[^&]+)', vid['href'])
             if m:
                 results.append('https://www.youtube.com' + m.group(1))