diff --git a/exwm-workspace.el b/exwm-workspace.el
index 0e078b7..77c9417 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -1320,11 +1320,6 @@ Please check `exwm-workspace--minibuffer-own-frame-p' first."
                        :window exwm--root :data num-workspaces))
     ;; Set _NET_DESKTOP_GEOMETRY.
     (exwm-workspace--set-desktop-geometry)
-    ;; Set _NET_DESKTOP_VIEWPORT (we don't support large desktop).
-    (xcb:+request exwm--connection
-        (make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT
-                       :window exwm--root
-                       :data (make-vector (* 2 num-workspaces) 0)))
     ;; Update and set _NET_WORKAREA.
     (exwm-workspace--update-workareas)
     ;; Set _NET_VIRTUAL_ROOTS.
diff --git a/exwm.el b/exwm.el
index 6737443..a972367 100644
--- a/exwm.el
+++ b/exwm.el
@@ -628,6 +628,11 @@
       (xcb:+request exwm--connection
           (make-instance 'xcb:ewmh:set-_NET_WM_NAME
                          :window i :data "EXWM"))))
+  ;; Set _NET_DESKTOP_VIEWPORT (we don't support large desktop).
+  (xcb:+request exwm--connection
+      (make-instance 'xcb:ewmh:set-_NET_DESKTOP_VIEWPORT
+                     :window exwm--root
+                     :data [0 0]))
   (xcb:flush exwm--connection))
 
 (defun exwm--exit-icccm-ewmh ()