diff --git a/webapp_media.py b/webapp_media.py
index 2220af8d9..ebde02736 100644
--- a/webapp_media.py
+++ b/webapp_media.py
@@ -49,6 +49,8 @@ def _add_embedded_video_from_sites(translate: {}, content: str,
             return content
 
     video_site = 'https://www.youtube.com'
+    if 'https://m.youtube.com' in content:
+        content = content.replace('https://m.youtube.com', video_site)
     if '"' + video_site in content:
         url = content.split('"' + video_site)[1]
         if '"' in url:
@@ -170,7 +172,12 @@ def _add_embedded_video_from_sites(translate: {}, content: str,
             url = content.split(site_str)[1]
             if '"' not in url:
                 continue
-            url = url.split('"')[0].replace('/watch/', '/embed/')
+            url = url.split('"')[0]
+            if '/c/' in url:
+                # don't try to embed peertube channel page
+                continue
+            url = url.replace('/w/', '/embed/')
+            url = url.replace('/watch/', '/embed/')
             content += \
                 "<center>\n<iframe loading=\"lazy\" " + \
                 "sandbox=\"allow-same-origin " + \