diff --git a/home/modules/linux/graphical/x11/hidpi.nix b/home/modules/linux/graphical/x11/hidpi.nix
index bc9bb58..2ec8e09 100644
--- a/home/modules/linux/graphical/x11/hidpi.nix
+++ b/home/modules/linux/graphical/x11/hidpi.nix
@@ -25,7 +25,6 @@ in
     # Load 4k Xresources
     xsession.initExtra = ''
       xrdb -merge ~/.config/X11/.Xresources
-      feh --bg-fill ~/wallpaper.jpg
     '';
   };
 }
diff --git a/home/modules/linux/graphical/x11/i3.nix b/home/modules/linux/graphical/x11/i3.nix
index 11e53fd..b92c7dc 100644
--- a/home/modules/linux/graphical/x11/i3.nix
+++ b/home/modules/linux/graphical/x11/i3.nix
@@ -107,7 +107,12 @@ in
         { command = "discord"; }
         { command = "dex -ae i3"; }
         { command = "ibus-daemon -drxR"; }
-      ];
+      ] ++
+      (
+        if (config.linux.graphical.wallpaper != "")
+        then [{ command = "${pkgs.feh}/bin/feh --bg-fill ${config.linux.graphical.wallpaper}"; }]
+        else [ ]
+      );
     };