diff --git a/src/config/preferences.c b/src/config/preferences.c
index 02abc273..c80b580f 100644
--- a/src/config/preferences.c
+++ b/src/config/preferences.c
@@ -431,6 +431,7 @@ _get_group(preference_t pref)
         case PREF_INTYPE:
         case PREF_HISTORY:
         case PREF_MOUSE:
+        case PREF_OCCUPANTS:
         case PREF_STATUSES:
         case PREF_STATUSES_CONSOLE:
         case PREF_STATUSES_CHAT:
@@ -493,6 +494,8 @@ _get_key(preference_t pref)
             return "history";
         case PREF_MOUSE:
             return "mouse";
+        case PREF_OCCUPANTS:
+            return "occupants";
         case PREF_STATUSES:
             return "statuses";
         case PREF_STATUSES_CONSOLE:
@@ -566,6 +569,7 @@ _get_default_boolean(preference_t pref)
         case PREF_NOTIFY_ROOM_CURRENT:
         case PREF_NOTIFY_TYPING_CURRENT:
         case PREF_SPLASH:
+        case PREF_OCCUPANTS:
             return TRUE;
         default:
             return FALSE;
diff --git a/src/config/preferences.h b/src/config/preferences.h
index c4e91d4a..2acb7c2e 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -57,6 +57,7 @@ typedef enum {
     PREF_INTYPE,
     PREF_HISTORY,
     PREF_MOUSE,
+    PREF_OCCUPANTS,
     PREF_STATUSES,
     PREF_STATUSES_CONSOLE,
     PREF_STATUSES_CHAT,
diff --git a/src/ui/window.c b/src/ui/window.c
index 26228307..43cfdb92 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "config/theme.h"
+#include "config/preferences.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 #include "xmpp/xmpp.h"
@@ -60,7 +61,7 @@ win_create(const char * const title, int cols, win_type_t type)
     ProfWin *new_win = malloc(sizeof(struct prof_win_t));
     new_win->from = strdup(title);
 
-    if (type == WIN_MUC) {
+    if (type == WIN_MUC && prefs_get_boolean(PREF_OCCUPANTS)) {
         new_win->win = newpad(PAD_SIZE, (cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1));
         wbkgd(new_win->win, COLOUR_TEXT);