diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 7b037303..fcb31ead 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -1724,8 +1724,10 @@ void *displayPortPollWork(void *param) {
                 std::vector<PortStatus> currentPortStatus;
                 ret = read(usb->mDisplayPortDebounceTimer, &res, sizeof(res));
                 ALOGI("usbdp: dp debounce triggered, val:%lu ret:%d", res, ret);
-                if (ret < 0)
-                    ALOGE("usbdp: debounce read errno:%d", errno);
+                if (ret < 0) {
+                    ALOGW("usbdp: debounce read error:%d", errno);
+                    continue;
+                }
                 queryVersionHelper(usb, &currentPortStatus);
             } else if (events[n].data.fd == usb->mDisplayPortActivateTimer) {
                 string activePartner, activePort;
@@ -1776,6 +1778,7 @@ void *displayPortPollWork(void *param) {
 
 error:
     /* Need to disarm so new threads don't get old event */
+    armTimerFdHelper(usb->mDisplayPortDebounceTimer, 0);
     armTimerFdHelper(usb->mDisplayPortActivateTimer, 0);
     close(link_training_status_fd);
 link_training_status_fd_error: