diff --git a/src/workgroups-functions.el b/src/workgroups-functions.el
index f82aa866c7adae8317bb5e15a9b48da9de2d552e..e81ff2347138ad018a855f7eefc071aaab09434b 100644
--- a/src/workgroups-functions.el
+++ b/src/workgroups-functions.el
@@ -1373,7 +1373,9 @@ BUFFER nil defaults to `current-buffer'."
   (reduce 'wg-string-list-union
           (list (wg-workgroup-base-wconfig-buf-uids workgroup)
                 (wg-workgroup-saved-wconfigs-buf-uids workgroup)
-                (wg-workgroup-associated-buf-uids workgroup))))
+                (if wg-restore-associated-buffers
+                    (wg-workgroup-associated-buf-uids workgroup))
+                )))
 
 (defun wg-session-all-buf-uids (&optional session)
   "Return a new list of all unique buf uids in SESSION.