diff --git a/client/src/lib.rs b/client/src/lib.rs
index fbc95e1905..112a04c2db 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -311,8 +311,6 @@ pub struct Client {
 
     flashing_lights_enabled: bool,
 
-    pub debug_vectors_enabled: bool,
-
     /// Terrrain view distance
     server_view_distance_limit: Option<u32>,
     view_distance: Option<u32>,
@@ -989,7 +987,6 @@ impl Client {
             dt_adjustment: 1.0,
 
             connected_server_constants: server_constants,
-            debug_vectors_enabled: false,
         })
     }
 
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 1dccfe9ab2..6db5454bd3 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -123,6 +123,8 @@ pub struct Scene {
     pub interpolated_time_of_day: Option<f64>,
     last_lightning: Option<(Vec3<f32>, f64)>,
     local_time: f64,
+
+    pub debug_vectors_enabled: bool,
 }
 
 pub struct SceneData<'a> {
@@ -362,6 +364,7 @@ impl Scene {
             interpolated_time_of_day: None,
             last_lightning: None,
             local_time: 0.0,
+            debug_vectors_enabled: false,
         }
     }
 
@@ -1649,7 +1652,7 @@ impl Scene {
         lines.fluid_vel.take().map(|id| self.debug.remove_shape(id));
         lines.wind.take().map(|id| self.debug.remove_shape(id));
         lines.vel.take().map(|id| self.debug.remove_shape(id));
-        if client.debug_vectors_enabled {
+        if self.debug_vectors_enabled {
             let ecs = client.state().ecs();
 
             let vels = &ecs.read_component::<comp::Vel>();
diff --git a/voxygen/src/ui/egui/mod.rs b/voxygen/src/ui/egui/mod.rs
index 2e440b12a9..7c44be44b5 100644
--- a/voxygen/src/ui/egui/mod.rs
+++ b/voxygen/src/ui/egui/mod.rs
@@ -103,7 +103,7 @@ impl EguiState {
                     }
                 },
                 EguiAction::SetShowDebugVector(enabled) => {
-                    client.debug_vectors_enabled = enabled;
+                    scene.debug_vectors_enabled = enabled;
                 },
             });