diff --git a/wp-includes/media.php b/wp-includes/media.php
index c471518ee..b066622ba 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1158,6 +1158,10 @@ class WP_Embed {
 		$rawattr = $attr;
 		$attr = wp_parse_args( $attr, wp_embed_defaults() );
 
+		// kses converts & into & and we need to undo this
+		// See http://core.trac.wordpress.org/ticket/11311
+		$url = str_replace( '&', '&', $url );
+
 		// Look for known internal handlers
 		ksort( $this->handlers );
 		foreach ( $this->handlers as $priority => $handlers ) {