diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs
index c146cef6da2..bef11f43e97 100644
--- a/components/script/dom/xrsession.rs
+++ b/components/script/dom/xrsession.rs
@@ -676,16 +676,8 @@ impl XRSessionMethods for XRSession {
 
         // https://immersive-web.github.io/layers/#updaterenderstatechanges
         // Step 1.
-        if init.baseLayer.is_some() {
-            if self.has_layers_feature() {
-                return Err(Error::NotSupported);
-            }
-            // https://github.com/immersive-web/layers/issues/189
-            if init.layers.is_some() {
-                return Err(Error::Type(String::from(
-                    "Cannot set WebXR layers and baseLayer",
-                )));
-            }
+        if init.baseLayer.is_some() && (self.has_layers_feature() || init.layers.is_some()) {
+            return Err(Error::NotSupported);
         }
 
         if let Some(Some(ref layers)) = init.layers {
diff --git a/tests/wpt/meta/webxr/layers/xrSession_updateRenderState.https.html.ini b/tests/wpt/meta/webxr/layers/xrSession_updateRenderState.https.html.ini
index 34aa807e81e..055063020ad 100644
--- a/tests/wpt/meta/webxr/layers/xrSession_updateRenderState.https.html.ini
+++ b/tests/wpt/meta/webxr/layers/xrSession_updateRenderState.https.html.ini
@@ -4,9 +4,3 @@
 
   [Ensure XRSession throws appropriate errors when updating render state without layers feature enabled - webgl2]
     expected: FAIL
-
-  [Ensure XRSession throws appropriate errors when updating render state with layers feature enabled - webgl]
-    expected: FAIL
-
-  [Ensure XRSession throws appropriate errors when updating render state with layers feature enabled - webgl2]
-    expected: FAIL