diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index 97d94995f95c..84380c8d11ff 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -1314,6 +1314,11 @@ impl FetchResponseListener for HTMLMediaElementContext {
         }
 
         if status.is_ok() {
+            if elem.ready_state.get() == ReadyState::HaveNothing {
+                // Make sure that we don't skip the HaveMetadata and HaveCurrentData
+                // states for short streams.
+                elem.change_ready_state(ReadyState::HaveMetadata);
+            }
             elem.change_ready_state(ReadyState::HaveEnoughData);
 
             elem.upcast::<EventTarget>().fire_event(atom!("progress"));
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
new file mode 100644
index 000000000000..95be71267283
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/load-events-networkState.html.ini
@@ -0,0 +1,4 @@
+[load-events-networkState.html]
+  [NETWORK_NO_SOURCE]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini
new file mode 100644
index 000000000000..dd5f01686e93
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-into-iframe.html.ini
@@ -0,0 +1,4 @@
+[resource-selection-invoke-insert-into-iframe.html]
+  [NOT invoking resource selection by inserting into other document with src set]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini
new file mode 100644
index 000000000000..80becaced048
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-pause-networkState.html.ini
@@ -0,0 +1,4 @@
+[resource-selection-invoke-pause-networkState.html]
+  [NOT invoking resource selection with pause() when networkState is not NETWORK_EMPTY]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
new file mode 100644
index 000000000000..cbd728cd5fdd
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
@@ -0,0 +1,4 @@
+[resource-selection-invoke-remove-from-document-networkState.html]
+  [NOT invoking resource selection with implicit pause() when networkState is not NETWORK_EMPTY]
+    expected: FAIL
+