diff --git a/wagtail/wagtailembeds/format.py b/wagtail/wagtailembeds/format.py
index cba95eb55a..177331957f 100644
--- a/wagtail/wagtailembeds/format.py
+++ b/wagtail/wagtailembeds/format.py
@@ -22,7 +22,7 @@ def embed_to_frontend_html(url):
             })
         else:
             return ''
-    except:
+    except embeds.EmbedNotFoundException:
         return ''
 
 
diff --git a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
index 8c69639602..7cb3762010 100644
--- a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
+++ b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py
@@ -10,10 +10,4 @@ register = template.Library()
 @register.filter
 def embed(url, max_width=None):
     embed = embeds.get_embed(url, max_width=max_width)
-    try:
-        if embed is not None:
-            return mark_safe(embed.html)
-        else:
-            return ''
-    except:
-        return ''
+    return mark_safe(embed.html)