diff --git a/src/state.rs b/src/state.rs
index 513ec523..eb081db2 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -234,7 +234,7 @@ pub struct Common {
     pub output_power_state: OutputPowerState,
     pub presentation_state: PresentationState,
     pub primary_selection_state: PrimarySelectionState,
-    pub data_control_state: Option<DataControlState>,
+    pub data_control_state: DataControlState,
     pub image_capture_source_state: ImageCaptureSourceState,
     pub screencopy_state: ScreencopyState,
     pub seat_state: SeatState<State>,
@@ -651,11 +651,11 @@ impl State {
         let idle_inhibit_manager_state = IdleInhibitManagerState::new::<State>(dh);
         let idle_inhibiting_surfaces = HashSet::new();
 
-        let data_control_state = crate::utils::env::bool_var("COSMIC_DATA_CONTROL_ENABLED")
-            .unwrap_or(false)
-            .then(|| {
-                DataControlState::new::<Self, _>(dh, Some(&primary_selection_state), |_| true)
-            });
+        let data_control_state = DataControlState::new::<Self, _>(
+            dh,
+            Some(&primary_selection_state),
+            client_not_sandboxed,
+        );
 
         let shell = Arc::new(parking_lot::RwLock::new(Shell::new(&config)));
 
diff --git a/src/wayland/handlers/data_control.rs b/src/wayland/handlers/data_control.rs
index f6132856..c17d9279 100644
--- a/src/wayland/handlers/data_control.rs
+++ b/src/wayland/handlers/data_control.rs
@@ -8,7 +8,7 @@ use smithay::{
 
 impl DataControlHandler for State {
     fn data_control_state(&mut self) -> &mut DataControlState {
-        self.common.data_control_state.as_mut().unwrap()
+        &mut self.common.data_control_state
     }
 }