1 files changed, 2 insertions, 2 deletions

diff --git a/src/window.c b/src/window.c
index 9d4bb4d4e11..d5f872125fa 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6177,8 +6177,8 @@ as nil.  */)
   (Lisp_Object window)
 {
   struct window *w = decode_live_window (window);
-  return Fcons (make_number (w->left_margin_cols),
-                make_number (w->right_margin_cols));
+  return Fcons (w->left_margin_cols ? make_number (w->left_margin_cols) : Qnil,
+                w->right_margin_cols ? make_number (w->right_margin_cols) : Qnil);
 }