diff --git a/drmframebuffer.h b/drmframebuffer.h
index 6f078d9..897589c 100644
--- a/drmframebuffer.h
+++ b/drmframebuffer.h
@@ -58,7 +58,8 @@
         return true;
 
       if (release_fence_fd_ >= 0) {
-        if (sync_wait(release_fence_fd_, -1) != 0) {
+        if (sync_wait(release_fence_fd_, kReleaseWaitTimeoutMs) != 0) {
+          ALOGE("Wait for release fence failed\n");
           return false;
         }
       }
@@ -93,6 +94,10 @@
     return ret;
   }
 
+  // Somewhat arbitrarily chosen, but wanted to stay below 3000ms, which is the
+  // system timeout
+  static const int kReleaseWaitTimeoutMs = 1500;
+
  private:
   sp<GraphicBuffer> buffer_;
   int release_fence_fd_;