diff --git a/README.md b/README.md
index 7c59dea9..c274a1cc 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ information on what to include when reporting a bug.
 
 ## Changelog
 
-There is nothing here yet.
+ - [Wayland] Bugfix: Key repeat could lead to a race condition (#1710)
 
 
 ## Contact
diff --git a/src/wl_window.c b/src/wl_window.c
index db32f449..ec4e60cd 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -867,10 +867,7 @@ static void handleEvents(int timeout)
         if (fds[1].revents & POLLIN)
         {
             read_ret = read(_glfw.wl.timerfd, &repeats, sizeof(repeats));
-            if (read_ret != 8)
-                return;
-
-            if (_glfw.wl.keyboardFocus)
+            if (read_ret == 8 && _glfw.wl.keyboardFocus)
             {
                 for (i = 0; i < repeats; ++i)
                 {
@@ -886,10 +883,8 @@ static void handleEvents(int timeout)
         if (fds[2].revents & POLLIN)
         {
             read_ret = read(_glfw.wl.cursorTimerfd, &repeats, sizeof(repeats));
-            if (read_ret != 8)
-                return;
-
-            incrementCursorImage(_glfw.wl.pointerFocus);
+            if (read_ret == 8)
+                incrementCursorImage(_glfw.wl.pointerFocus);
         }
     }
     else