diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
index b2413389f3..3c4dc9b20a 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
@@ -149,6 +149,9 @@
 				ed.schema.addValidElements('td['+tdAttr+'],th['+tdAttr+']');
 				// Adds "name" for <a>
 				ed.schema.addValidElements('a['+commonAttr+'|href|target|ping|rel|media|type|name]');
+				// Extend <object> and <embed>
+				ed.schema.addValidElements('object[*],param[id|name|value|valuetype|type],embed[*]');
+				ed.schema.addValidChildren('object[*]');
 			});
 
 			ed.onInit.add(function(ed) {