diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix
index 5f835528c851..f81ec563e7a6 100644
--- a/nixos/tests/xfce-wayland.nix
+++ b/nixos/tests/xfce-wayland.nix
@@ -23,8 +23,6 @@ import ./make-test-python.nix (
 
         services.xserver.desktopManager.xfce.enable = true;
         services.xserver.desktopManager.xfce.enableWaylandSession = true;
-        # https://gitlab.xfce.org/apps/xfce4-screensaver/-/merge_requests/28
-        services.xserver.desktopManager.xfce.enableScreensaver = false;
         environment.systemPackages = [ pkgs.wlrctl ];
       };
 
diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
index 6d956e14b29a..a69f97b6e45f 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix
@@ -16,6 +16,7 @@
   python3,
   systemd,
   xfconf,
+  xfdesktop,
   lib,
 }:
 
@@ -26,9 +27,9 @@ in
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-screensaver";
-  version = "4.18.3";
+  version = "4.18.4";
 
-  sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ=";
+  sha256 = "sha256-vkxkryi7JQg1L/JdWnO9qmW6Zx6xP5Urq4kXMe7Iiyc=";
 
   nativeBuildInputs = [
     gobject-introspection
@@ -56,6 +57,11 @@ mkXfceDerivation {
 
   makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
 
+  preFixup = ''
+    # For default wallpaper.
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${xfdesktop}/share")
+  '';
+
   meta = with lib; {
     description = "Screensaver for Xfce";
     maintainers = with maintainers; [ symphorien ] ++ teams.xfce.members;