diff --git a/userspace/files/weston.service b/userspace/files/weston.service
index 08bb7e0..0bb0d0d 100644
--- a/userspace/files/weston.service
+++ b/userspace/files/weston.service
@@ -15,9 +15,8 @@ TTYReset=yes
 TTYVHangup=yes
 TTYVTDisallocate=yes
 
-# TODO: DCS commands (e.g. brightness setting) don't work without this on tizi
-ExecStartPre=/bin/bash -c "/usr/comma/modetest -M msm_drm -s 26:1080x2160-60 && \
-                           sleep 1"
+# TODO: DCS commands (e.g. brightness setting) don't work without this on certain panels
+ExecStartPre=/bin/bash -c "if [ -d /sys/kernel/debug/dsi_mate10_lite_video_display ]; then echo modesetting; /usr/comma/modetest -M msm_drm -s 26:1080x2160-60; sleep 1; fi"
 
 ExecStartPre=/bin/bash -c "mkdir -p $XDG_RUNTIME_DIR"
 ExecStartPre=/bin/bash -c "chown -R comma: $XDG_RUNTIME_DIR"