diff --git a/CHANGELOG.md b/CHANGELOG.md
index de797ece86..72bdf40338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -289,6 +289,7 @@ DeviceDescriptor {
 
 #### General
 
+- AutoNoVSync now correctly falls back to Fifo @simbleau in [#2842](https://github.com/gfx-rs/wgpu/pull/2842)
 - Fix trac(y/ing) compile issue by @cwfitzgerald in [#2333](https://github.com/gfx-rs/wgpu/pull/2333)
 - Improve detection and validation of cubemap views by @kvark in [#2331](https://github.com/gfx-rs/wgpu/pull/2331)
 - Don't create array layer trackers for 3D textures. by @ElectronicRU in [#2348](https://github.com/gfx-rs/wgpu/pull/2348)
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index e86bb201e9..59a7460d76 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -4995,6 +4995,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                             if caps.present_modes.contains(&wgt::PresentMode::Mailbox) {
                                 break wgt::PresentMode::Mailbox;
                             }
+                            if caps.present_modes.contains(&wgt::PresentMode::Fifo) {
+                                break wgt::PresentMode::Fifo;
+                            }
                         }
                         _ => {}
                     }