diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c
index 0909d0b76..183ff5251 100644
--- a/src/detection/displayserver/linux/xcb.c
+++ b/src/detection/displayserver/linux/xcb.c
@@ -120,8 +120,8 @@ void ffdsConnectXcb(const FFinstance* instance, FFDisplayServerResult* result)
             (uint32_t) iterator.data->width_in_pixels,
             (uint32_t) iterator.data->height_in_pixels,
             0,
-            0,
-            0
+            (uint32_t) iterator.data->width_in_pixels,
+            (uint32_t) iterator.data->height_in_pixels
         );
         ffxcb_screen_next(&iterator);
     }
@@ -187,8 +187,8 @@ static bool xcbRandrHandleModeInfo(XcbRandrData* data, xcb_randr_mode_info_t* mo
         (uint32_t) modeInfo->width,
         (uint32_t) modeInfo->height,
         refreshRate == 0 ? data->defaultRefreshRate : refreshRate,
-        0,
-        0
+        (uint32_t) modeInfo->width,
+        (uint32_t) modeInfo->height
     );
 }
 
@@ -224,8 +224,8 @@ static bool xcbRandrHandleCrtc(XcbRandrData* data, xcb_randr_crtc_t crtc)
         (uint32_t) crtcInfoReply->width,
         (uint32_t) crtcInfoReply->height,
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) crtcInfoReply->width,
+        (uint32_t) crtcInfoReply->height
     );
 
     free(crtcInfoReply);
@@ -269,8 +269,8 @@ static bool xcbRandrHandleMonitor(XcbRandrData* data, xcb_randr_monitor_info_t*
         (uint32_t) monitor->width,
         (uint32_t) monitor->height,
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) monitor->width,
+        (uint32_t) monitor->height
     );
 }
 
@@ -329,8 +329,8 @@ static void xcbRandrHandleScreen(XcbRandrData* data, xcb_screen_t* screen)
         (uint32_t) screen->width_in_pixels,
         (uint32_t) screen->height_in_pixels,
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) screen->width_in_pixels,
+        (uint32_t) screen->height_in_pixels
     );
 }
 
diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c
index a804dd29a..50eba6a2d 100644
--- a/src/detection/displayserver/linux/xlib.c
+++ b/src/detection/displayserver/linux/xlib.c
@@ -82,11 +82,11 @@ void ffdsConnectXlib(const FFinstance* instance, FFDisplayServerResult* result)
         Screen* screen = ScreenOfDisplay(display, i);
         ffdsAppendDisplay(
             result,
-            (uint32_t) screen->width,
-            (uint32_t) screen->height,
+            (uint32_t) WidthOfScreen(screen),
+            (uint32_t) HeightOfScreen(screen),
             0,
-            0,
-            0
+            (uint32_t) WidthOfScreen(screen),
+            (uint32_t) HeightOfScreen(screen)
         );
     }
 
@@ -146,8 +146,8 @@ static bool xrandrHandleModeInfo(XrandrData* data, XRRModeInfo* modeInfo)
         (uint32_t) modeInfo->width,
         (uint32_t) modeInfo->height,
         refreshRate == 0 ? data->defaultRefreshRate : refreshRate,
-        0,
-        0
+        (uint32_t) modeInfo->width,
+        (uint32_t) modeInfo->height
     );
 }
 
@@ -177,8 +177,8 @@ static bool xrandrHandleCrtc(XrandrData* data, RRCrtc crtc)
         (uint32_t) crtcInfo->width,
         (uint32_t) crtcInfo->height,
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) crtcInfo->width,
+        (uint32_t) crtcInfo->height
     );
 
     data->ffXRRFreeCrtcInfo(crtcInfo);
@@ -213,8 +213,8 @@ static bool xrandrHandleMonitor(XrandrData* data, XRRMonitorInfo* monitorInfo)
         (uint32_t) monitorInfo->width,
         (uint32_t) monitorInfo->height,
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) monitorInfo->width,
+        (uint32_t) monitorInfo->height
     );
 }
 
@@ -267,8 +267,8 @@ static void xrandrHandleScreen(XrandrData* data, Screen* screen)
         (uint32_t) WidthOfScreen(screen),
         (uint32_t) HeightOfScreen(screen),
         data->defaultRefreshRate,
-        0,
-        0
+        (uint32_t) WidthOfScreen(screen),
+        (uint32_t) HeightOfScreen(screen)
     );
 }