diff --git a/modules/desktop/files/etc/skel/.config/lxsession/LXDE/autostart b/modules/desktop/files/etc/skel/.config/lxsession/LXDE/autostart
index d8f2e230cd686b2d9afd9ba7ad031a4f4b3f993f..90ff4ce7f3d7e39054d477559e1dda71dc526836 100644
--- a/modules/desktop/files/etc/skel/.config/lxsession/LXDE/autostart
+++ b/modules/desktop/files/etc/skel/.config/lxsession/LXDE/autostart
@@ -1,3 +1,2 @@
 @lxpanel --profile LXDE
 @pcmanfm --desktop --profile LXDE
-@xscreensaver -no-splash
diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 1ad200293c866d3f1c2937c65d23508bcdd6301d..fb48b09106c48be62d3ebe5cb5700120d6096f33 100644
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -28,6 +28,10 @@ class desktop {
 		require => Package['lxde'],
 	}
 
+	package { 'xscreensaver':
+		ensure => absent,
+	}
+
 	$packages = [
 		'pcmanfm',
 		'iceweasel',