diff --git a/lib/Github/HttpClient/Listener/ErrorListener.php b/lib/Github/HttpClient/Listener/ErrorListener.php
index 1d537240900..3f20c05093b 100644
--- a/lib/Github/HttpClient/Listener/ErrorListener.php
+++ b/lib/Github/HttpClient/Listener/ErrorListener.php
@@ -43,7 +43,8 @@ public function postSend(RequestInterface $request, MessageInterface $response)
         /** @var $response \Github\HttpClient\Message\Response */
         if ($response->isClientError() || $response->isServerError()) {
             $remaining = $response->getHeader('X-RateLimit-Remaining');
-            if (null !== $remaining && 1 > $remaining) {
+
+            if (null !== $remaining && 1 > $remaining && 'rate_limit' !== substr($request->getResource(), 1, 10)) {
                 throw new ApiLimitExceedException($this->options['api_limit']);
             }