diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index be3d2fb882..a791440d0e 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -564,9 +564,7 @@ static int parse_viewport(const char *wps_bufptr,
 #ifdef HAVE_REMOTE_LCD
     if (wps_data->remote_wps)
     {
-        if ((vp->x >= LCD_REMOTE_WIDTH) || 
-            ((vp->x + vp->width) >= LCD_REMOTE_WIDTH) ||
-            (vp->y >= LCD_REMOTE_HEIGHT) || 
+        if (((vp->x + vp->width) >= LCD_REMOTE_WIDTH) ||
             ((vp->y + vp->height) >= LCD_REMOTE_HEIGHT))
         {
             return WPS_ERROR_INVALID_PARAM;
@@ -575,8 +573,7 @@ static int parse_viewport(const char *wps_bufptr,
     else
 #else
     {
-        if ((vp->x >= LCD_WIDTH) || 
-            (vp->y >= LCD_HEIGHT) || 
+        if (((vp->x + vp->width) >= LCD_WIDTH) ||
             ((vp->y + vp->height) >= LCD_HEIGHT))
         {
             return WPS_ERROR_INVALID_PARAM;