diff --git a/src/backend/render/element.rs b/src/backend/render/element.rs
index c4b31521..bf5d37b4 100644
--- a/src/backend/render/element.rs
+++ b/src/backend/render/element.rs
@@ -217,36 +217,30 @@ where
                 RenderElement::<R>::draw(elem, frame, src, dst, damage, opaque_regions)
             }
             CosmicElement::Mirror(elem) => {
-                let elem = {
-                    let glow_frame = R::glow_frame_mut(frame);
-                    RenderElement::<GlowRenderer>::draw(
-                        elem,
-                        glow_frame,
-                        src,
-                        dst,
-                        damage,
-                        opaque_regions,
-                    )
-                    .map_err(FromGlesError::from_gles_error)
-                };
-                elem
+                let glow_frame = R::glow_frame_mut(frame);
+                RenderElement::<GlowRenderer>::draw(
+                    elem,
+                    glow_frame,
+                    src,
+                    dst,
+                    damage,
+                    opaque_regions,
+                )
+                .map_err(FromGlesError::from_gles_error)
             }
             CosmicElement::Zoom(elem) => elem.draw(frame, src, dst, damage, opaque_regions),
             #[cfg(feature = "debug")]
             CosmicElement::Egui(elem) => {
-                let elem = {
-                    let glow_frame = R::glow_frame_mut(frame);
-                    RenderElement::<GlowRenderer>::draw(
-                        elem,
-                        glow_frame,
-                        src,
-                        dst,
-                        damage,
-                        opaque_regions,
-                    )
-                    .map_err(FromGlesError::from_gles_error)
-                };
-                elem
+                let glow_frame = R::glow_frame_mut(frame);
+                RenderElement::<GlowRenderer>::draw(
+                    elem,
+                    glow_frame,
+                    src,
+                    dst,
+                    damage,
+                    opaque_regions,
+                )
+                .map_err(FromGlesError::from_gles_error)
             }
         }
     }
@@ -260,23 +254,13 @@ where
             CosmicElement::AdditionalDamage(elem) => elem.underlying_storage(renderer),
             CosmicElement::Mirror(elem) => {
                 let glow_renderer = renderer.glow_renderer_mut();
-                match elem.underlying_storage(glow_renderer) {
-                    Some(UnderlyingStorage::Wayland(buffer)) => {
-                        Some(UnderlyingStorage::Wayland(buffer))
-                    }
-                    _ => None,
-                }
+                elem.underlying_storage(glow_renderer)
             }
             CosmicElement::Zoom(elem) => elem.underlying_storage(renderer),
             #[cfg(feature = "debug")]
             CosmicElement::Egui(elem) => {
                 let glow_renderer = renderer.glow_renderer_mut();
-                match elem.underlying_storage(glow_renderer) {
-                    Some(UnderlyingStorage::Wayland(buffer)) => {
-                        Some(UnderlyingStorage::Wayland(buffer))
-                    }
-                    _ => None,
-                }
+                elem.underlying_storage(glow_renderer)
             }
         }
     }
diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs
index ff79a147..f6aa3f6d 100644
--- a/src/shell/element/mod.rs
+++ b/src/shell/element/mod.rs
@@ -1371,12 +1371,7 @@ where
             #[cfg(feature = "debug")]
             CosmicMappedRenderElement::Egui(elem) => {
                 let glow_renderer = renderer.glow_renderer_mut();
-                match elem.underlying_storage(glow_renderer) {
-                    Some(UnderlyingStorage::Wayland(buffer)) => {
-                        Some(UnderlyingStorage::Wayland(buffer))
-                    }
-                    _ => None,
-                }
+                elem.underlying_storage(glow_renderer)
             }
         }
     }