diff --git a/selfdrive/camerad/cameras/camera_qcom.c b/selfdrive/camerad/cameras/camera_qcom.c
index 6cef28f215..1d1396d7bf 100644
--- a/selfdrive/camerad/cameras/camera_qcom.c
+++ b/selfdrive/camerad/cameras/camera_qcom.c
@@ -2117,7 +2117,7 @@ void cameras_run(DualCameraState *s) {
 
     int ret = poll(fds, ARRAYSIZE(fds), 1000);
     if (ret <= 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }
diff --git a/selfdrive/camerad/main.cc b/selfdrive/camerad/main.cc
index 304990ca9d..1561168170 100644
--- a/selfdrive/camerad/main.cc
+++ b/selfdrive/camerad/main.cc
@@ -604,10 +604,7 @@ void* visionserver_client_thread(void* arg) {
     }
     int ret = zmq_poll(polls, num_polls, -1);
     if (ret < 0) {
-      if (errno == EINTR){
-        LOGW("poll EINTR");
-        continue;
-      }
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }
@@ -799,7 +796,7 @@ void* visionserver_thread(void* arg) {
 
     int ret = zmq_poll(polls, ARRAYSIZE(polls), -1);
     if (ret < 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
       LOGE("poll failed (%d - %d)", ret, errno);
       break;
     }
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
index a87ca30031..12a469a4a2 100644
--- a/selfdrive/ui/ui.cc
+++ b/selfdrive/ui/ui.cc
@@ -598,7 +598,7 @@ static void ui_update(UIState *s) {
       int ret = zmq_poll(polls, 1, 1000);
     #endif
     if (ret < 0) {
-      if (errno == EINTR) continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
 
       LOGE("poll failed (%d - %d)", ret, errno);
       close(s->ipc_fd);