diff --git a/source/blender/draw/engines/overlay/overlay_next_mesh.hh b/source/blender/draw/engines/overlay/overlay_next_mesh.hh
index e264bbabe6b..33173350e6f 100644
--- a/source/blender/draw/engines/overlay/overlay_next_mesh.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_mesh.hh
@@ -290,7 +290,7 @@ class Meshes : Overlay {
     /* WORKAROUND: GPU subdiv uses a different normal format. Remove this once GPU subdiv is
      * refactored. */
     const bool use_gpu_subdiv = BKE_subsurf_modifier_has_gpu_subdiv(static_cast<Mesh *>(ob->data));
-    const bool draw_as_solid = (ob->dt > OB_WIRE);
+    const bool draw_as_solid = (ob->dt > OB_WIRE) && !state.xray_enabled;
 
     if (show_retopology_) {
       gpu::Batch *geom = DRW_mesh_batch_cache_get_edit_triangles(mesh);
diff --git a/source/blender/draw/engines/overlay/overlay_next_prepass.hh b/source/blender/draw/engines/overlay/overlay_next_prepass.hh
index b2132ed774f..b60aa526c6b 100644
--- a/source/blender/draw/engines/overlay/overlay_next_prepass.hh
+++ b/source/blender/draw/engines/overlay/overlay_next_prepass.hh
@@ -72,7 +72,7 @@ class Prepass : Overlay {
  public:
   void begin_sync(Resources &res, const State &state) final
   {
-    enabled_ = state.is_space_v3d();
+    enabled_ = state.is_space_v3d() && !state.xray_enabled;
 
     if (!enabled_) {
       /* Not used. But release the data. */