diff --git src/wp-includes/template-loader.php src/wp-includes/template-loader.php
index d3eebe9..5432523 100644
--- src/wp-includes/template-loader.php
+++ src/wp-includes/template-loader.php
@@ -39,25 +39,12 @@ elseif ( is_feed() ) :
 elseif ( is_trackback() ) :
 	include( ABSPATH . 'wp-trackback.php' );
 	return;
-elseif ( is_embed() ) :
-	$template = ABSPATH . WPINC . '/embed-template.php';
-
-	/**
-	 * Filter the template used for embedded posts.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param string $template Path to the template file.
-	 */
-	$template = apply_filters( 'embed_template', $template );
-
-	include ( $template );
-	return;
 endif;
 
 if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
 	$template = false;
-	if     ( is_404()            && $template = get_404_template()            ) :
+	if ( is_embed()              && $template = get_embed_template()          ) :
+	elseif ( is_404()            && $template = get_404_template()            ) :
 	elseif ( is_search()         && $template = get_search_template()         ) :
 	elseif ( is_front_page()     && $template = get_front_page_template()     ) :
 	elseif ( is_home()           && $template = get_home_template()           ) :
@@ -78,6 +65,7 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
 	else :
 		$template = get_index_template();
 	endif;
+
 	/**
 	 * Filter the path of the current template before including it.
 	 *
diff --git src/wp-includes/template.php src/wp-includes/template.php
index 620d89d..26b8826 100644
--- src/wp-includes/template.php
+++ src/wp-includes/template.php
@@ -488,6 +488,31 @@ function get_comments_popup_template() {
 }
 
 /**
+ * Retrieve path of embed template in current or parent template.
+ *
+ * Checks for embed template in current template, if it exists or in the
+ * parent template.
+ *
+ * The template path is filterable via the dynamic {@see '$type_template'} hook,
+ * e.g. 'embed_template'.
+ *
+ * @since 4.4.0
+ *
+ * @see get_query_template()
+ *
+ * @return string Full path to embed template file.
+ */
+function get_embed_template() {
+	$template = get_query_template( 'embed', array( 'wp-embed.php' ) );
+
+	if ( '' === $template ) {
+		$template = ABSPATH . WPINC . '/embed-template.php';
+	}
+
+	return $template;
+}
+
+/**
  * Retrieve the name of the highest priority template file that exists.
  *
  * Searches in the STYLESHEETPATH before TEMPLATEPATH so that themes which