diff --git a/system_files/deck/shared/usr/bin/gamescope-autologin b/system_files/deck/shared/usr/bin/gamescope-autologin
index 786b5d6f..4f6bb85a 100755
--- a/system_files/deck/shared/usr/bin/gamescope-autologin
+++ b/system_files/deck/shared/usr/bin/gamescope-autologin
@@ -4,6 +4,12 @@ USER=$(id -nu 1000)
 
 # SteamOS SDDM config
 SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
+AUTOLOGIN_CONF='/etc/sddm.conf.d/zz-steamos-autologin.conf'
+
+# Avoid autologin conflict
+if [[ -f ${AUTOLOGIN_CONF} ]]; then
+  rm -f ${AUTOLOGIN_CONF}
+fi
 
 # Configure autologin
 sed -i 's/.*Session=.*/Session=gamescope-session.desktop/g' ${SDDM_CONF}