diff --git a/lib/rate_limiter.rb b/lib/rate_limiter.rb
index 091eea3c288..7f3094e11a6 100644
--- a/lib/rate_limiter.rb
+++ b/lib/rate_limiter.rb
@@ -102,6 +102,12 @@ class RateLimiter
   def rollback!
     return if RateLimiter.disabled?
     redis.lpop(prefixed_key)
+  rescue Redis::CommandError => e
+    if e.message =~ /READONLY/
+      # TODO,switch to in-memory rate limiter
+    else
+      raise
+    end
   end
 
   def remaining