diff --git a/src/wallpaper.c b/src/wallpaper.c
index f0bf891d5ee4349cc888ef4ae42da11e3df348ee..9df259f59545ec3684d765e0ecd5ebb459807982 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -503,7 +503,7 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled,
 					fputc(' ', fp);
 					if (use_filelist) {
 #ifdef HAVE_LIBXINERAMA
-						for (int i = 0; (i < num_xinerama_screens) && filelist_pos; i++) {
+						for (int i = 0; (i < opt.xinerama ? num_xinerama_screens : 1) && filelist_pos; i++) {
 #else
 						for (int i = 0; (i < 1                   ) && filelist_pos; i++) {
 #endif