diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 9c43aa4bb5..55da3a7f17 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -97,7 +97,7 @@ const events = [
 		event_names: ['loadedmetadata'],
 		filter: (node: Element, name: string) =>
 			node.is_media_node() &&
-			(name === 'buffered' || name === 'seekable' || name === 'readyState')
+			(name === 'buffered' || name === 'seekable')
 	},
 	{
 		event_names: ['volumechange'],
@@ -130,7 +130,7 @@ const events = [
 			(name === 'videoHeight' || name === 'videoWidth')
 	},
 	{
-		event_names: ['loadeddata', 'canplay', 'canplaythrough', 'emptied'],
+		event_names: ['loadedmetadata', 'loadeddata', 'canplay', 'canplaythrough', 'playing', 'waiting', 'emptied'],
 		filter: (node: Element, name: string) =>
 			node.is_media_node() &&
 			name === 'readyState'
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index bf4d16739d..8320d92b2a 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -37,12 +37,12 @@ function create_fragment(ctx) {
 		c() {
 			audio = element("audio");
 			if (/*buffered*/ ctx[0] === void 0) add_render_callback(() => /*audio_progress_handler*/ ctx[12].call(audio));
-			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0 || /*readyState*/ ctx[11] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[13].call(audio));
+			if (/*buffered*/ ctx[0] === void 0 || /*seekable*/ ctx[1] === void 0) add_render_callback(() => /*audio_loadedmetadata_handler*/ ctx[13].call(audio));
 			if (/*played*/ ctx[2] === void 0 || /*currentTime*/ ctx[3] === void 0 || /*ended*/ ctx[10] === void 0) add_render_callback(audio_timeupdate_handler);
 			if (/*duration*/ ctx[4] === void 0) add_render_callback(() => /*audio_durationchange_handler*/ ctx[15].call(audio));
 			if (/*seeking*/ ctx[9] === void 0) add_render_callback(() => /*audio_seeking_seeked_handler*/ ctx[19].call(audio));
 			if (/*ended*/ ctx[10] === void 0) add_render_callback(() => /*audio_ended_handler*/ ctx[20].call(audio));
-			if (/*readyState*/ ctx[11] === void 0) add_render_callback(() => /*audio_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[21].call(audio));
+			if (/*readyState*/ ctx[11] === void 0) add_render_callback(() => /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21].call(audio));
 		},
 		m(target, anchor) {
 			insert(target, audio, anchor);
@@ -70,10 +70,13 @@ function create_fragment(ctx) {
 					listen(audio, "seeking", /*audio_seeking_seeked_handler*/ ctx[19]),
 					listen(audio, "seeked", /*audio_seeking_seeked_handler*/ ctx[19]),
 					listen(audio, "ended", /*audio_ended_handler*/ ctx[20]),
-					listen(audio, "loadeddata", /*audio_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[21]),
-					listen(audio, "canplay", /*audio_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[21]),
-					listen(audio, "canplaythrough", /*audio_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[21]),
-					listen(audio, "emptied", /*audio_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[21])
+					listen(audio, "loadedmetadata", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "loadeddata", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "canplay", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "canplaythrough", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "playing", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "waiting", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21]),
+					listen(audio, "emptied", /*audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[21])
 				];
 
 				mounted = true;
@@ -134,10 +137,8 @@ function instance($$self, $$props, $$invalidate) {
 	function audio_loadedmetadata_handler() {
 		buffered = time_ranges_to_array(this.buffered);
 		seekable = time_ranges_to_array(this.seekable);
-		readyState = this.readyState;
 		$$invalidate(0, buffered);
 		$$invalidate(1, seekable);
-		$$invalidate(11, readyState);
 	}
 
 	function audio_timeupdate_handler() {
@@ -181,7 +182,7 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(10, ended);
 	}
 
-	function audio_loadeddata_canplay_canplaythrough_emptied_handler() {
+	function audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler() {
 		readyState = this.readyState;
 		$$invalidate(11, readyState);
 	}
@@ -223,7 +224,7 @@ function instance($$self, $$props, $$invalidate) {
 		audio_ratechange_handler,
 		audio_seeking_seeked_handler,
 		audio_ended_handler,
-		audio_loadeddata_canplay_canplaythrough_emptied_handler
+		audio_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler
 	];
 }
 
@@ -248,4 +249,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;
diff --git a/test/js/samples/video-bindings/expected.js b/test/js/samples/video-bindings/expected.js
index b17506b981..fe30240bfc 100644
--- a/test/js/samples/video-bindings/expected.js
+++ b/test/js/samples/video-bindings/expected.js
@@ -38,8 +38,7 @@ function create_fragment(ctx) {
 			video = element("video");
 			if (/*videoHeight*/ ctx[1] === void 0 || /*videoWidth*/ ctx[2] === void 0) add_render_callback(() => /*video_resize_handler*/ ctx[6].call(video));
 			add_render_callback(() => /*video_elementresize_handler*/ ctx[7].call(video));
-			if (/*readyState*/ ctx[4] === void 0) add_render_callback(() => /*video_loadedmetadata_handler*/ ctx[8].call(video));
-			if (/*readyState*/ ctx[4] === void 0) add_render_callback(() => /*video_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[9].call(video));
+			if (/*readyState*/ ctx[4] === void 0) add_render_callback(() => /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8].call(video));
 		},
 		m(target, anchor) {
 			insert(target, video, anchor);
@@ -49,11 +48,13 @@ function create_fragment(ctx) {
 				dispose = [
 					listen(video, "timeupdate", video_timeupdate_handler),
 					listen(video, "resize", /*video_resize_handler*/ ctx[6]),
-					listen(video, "loadedmetadata", /*video_loadedmetadata_handler*/ ctx[8]),
-					listen(video, "loadeddata", /*video_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[9]),
-					listen(video, "canplay", /*video_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[9]),
-					listen(video, "canplaythrough", /*video_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[9]),
-					listen(video, "emptied", /*video_loadeddata_canplay_canplaythrough_emptied_handler*/ ctx[9])
+					listen(video, "loadedmetadata", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "loadeddata", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "canplay", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "canplaythrough", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "playing", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "waiting", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8]),
+					listen(video, "emptied", /*video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler*/ ctx[8])
 				];
 
 				mounted = true;
@@ -101,12 +102,7 @@ function instance($$self, $$props, $$invalidate) {
 		$$invalidate(3, offsetWidth);
 	}
 
-	function video_loadedmetadata_handler() {
-		readyState = this.readyState;
-		$$invalidate(4, readyState);
-	}
-
-	function video_loadeddata_canplay_canplaythrough_emptied_handler() {
+	function video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler() {
 		readyState = this.readyState;
 		$$invalidate(4, readyState);
 	}
@@ -128,8 +124,7 @@ function instance($$self, $$props, $$invalidate) {
 		video_timeupdate_handler,
 		video_resize_handler,
 		video_elementresize_handler,
-		video_loadedmetadata_handler,
-		video_loadeddata_canplay_canplaythrough_emptied_handler
+		video_loadedmetadata_loadeddata_canplay_canplaythrough_playing_waiting_emptied_handler
 	];
 }
 
@@ -147,4 +142,4 @@ class Component extends SvelteComponent {
 	}
 }
 
-export default Component;
\ No newline at end of file
+export default Component;