diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs
index e752e500..eb4bf461 100644
--- a/src/backend/kms/mod.rs
+++ b/src/backend/kms/mod.rs
@@ -766,7 +766,7 @@ impl Surface {
             &self.output,
             false,
             #[cfg(feature = "debug")]
-            &mut self.fps,
+            Some(&mut self.fps),
         ) {
             Ok(_) => {
                 surface
diff --git a/src/backend/render/mod.rs b/src/backend/render/mod.rs
index 5885905b..121e822f 100644
--- a/src/backend/render/mod.rs
+++ b/src/backend/render/mod.rs
@@ -150,7 +150,7 @@ pub fn render_output<R>(
     state: &mut Common,
     output: &Output,
     hardware_cursor: bool,
-    #[cfg(feature = "debug")] fps: Option<&mut Fps>,
+    #[cfg(feature = "debug")] mut fps: Option<&mut Fps>,
 ) -> Result<Option<Vec<Rectangle<i32, Physical>>>, RenderError<R>>
 where
     R: Renderer + ImportAll + AsGles2Renderer,
@@ -158,7 +158,7 @@ where
     CustomElem: RenderElement<R>,
 {
     #[cfg(feature = "debug")]
-    {
+    if let Some(ref mut fps) = fps {
         fps.start();
     }
     let workspace = state.shell.active_space(output);
@@ -170,7 +170,7 @@ where
         }
         #[cfg(feature = "debug")]
         {
-            render_fullscreen(gpu, renderer, window, state, output, hardware_cursor, fps)
+            render_fullscreen(gpu, renderer, window, state, output, hardware_cursor, fps.as_deref_mut())
         }
     } else {
         #[cfg(not(feature = "debug"))]
@@ -179,12 +179,12 @@ where
         }
         #[cfg(feature = "debug")]
         {
-            render_desktop(gpu, renderer, age, state, output, hardware_cursor, fps)
+            render_desktop(gpu, renderer, age, state, output, hardware_cursor, fps.as_deref_mut())
         }
     };
 
     #[cfg(feature = "debug")]
-    {
+    if let Some(ref mut fps) = fps {
         fps.end();
     }
 
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index 98f1ace5..cea31e8a 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -61,7 +61,7 @@ impl WinitState {
             &self.output,
             true,
             #[cfg(feature = "debug")]
-            &mut self.fps,
+            Some(&mut self.fps),
         ) {
             Ok(damage) => {
                 state
diff --git a/src/backend/x11.rs b/src/backend/x11.rs
index 49151a11..381fac88 100644
--- a/src/backend/x11.rs
+++ b/src/backend/x11.rs
@@ -205,7 +205,7 @@ impl Surface {
             &self.output,
             true,
             #[cfg(feature = "debug")]
-            &mut self.fps,
+            Some(&mut self.fps),
         ) {
             Ok(_) => {
                 state