--- a/gfx/wr/webrender/src/renderer.rs
+++ b/gfx/wr/webrender/src/renderer.rs
@@ -3148,16 +3148,19 @@ impl Renderer {
                 // for a bit more context.
                 if doc_index != last_document_index {
                     self.texture_resolver.end_pass(&mut self.device, None, None);
                 }
             }
 
             self.unlock_external_images();
             self.active_documents = active_documents;
+
+            let _gm = self.gpu_profile.start_marker("end frame");
+            self.gpu_profile.end_frame();
         });
 
         if let Some(device_size) = device_size {
             // Update the state of the debug overlay surface, ensuring that
             // the compositor mode has a suitable surface to draw to, if required.
             self.update_debug_overlay(device_size);
 
             // Bind a surface to draw the debug / profiler information to.
@@ -3259,18 +3262,16 @@ impl Renderer {
         self.profile_counters.reset();
         self.profile_counters.frame_counter.inc();
         results.stats.resource_upload_time = self.resource_upload_time;
         self.resource_upload_time = 0;
         results.stats.gpu_cache_upload_time = self.gpu_cache_upload_time;
         self.gpu_cache_upload_time = 0;
 
         profile_timers.cpu_time.profile(|| {
-            let _gm = self.gpu_profile.start_marker("end frame");
-            self.gpu_profile.end_frame();
             if let Some(debug_renderer) = self.debug.try_get_mut() {
                 let small_screen = self.debug_flags.contains(DebugFlags::SMALL_SCREEN);
                 let scale = if small_screen { 1.6 } else { 1.0 };
                 // TODO(gw): Tidy this up so that compositor config integrates better
                 //           with the (non-compositor) surface y-flip options.
                 let surface_origin_is_top_left = match self.compositor_config {
                     CompositorConfig::Native { .. } => true,
                     CompositorConfig::Draw { .. } => self.device.surface_origin_is_top_left(),