diff --git a/r2/r2/controllers/error.py b/r2/r2/controllers/error.py
index 7a1914b0d..9c97fe72a 100644
--- a/r2/r2/controllers/error.py
+++ b/r2/r2/controllers/error.py
@@ -85,6 +85,7 @@ class ErrorController(RedditController):
     allowed_render_styles = ('html', 'xml', 'js', 'embed', '')
     def __before__(self):
         try:
+            c.error_page = True
             RedditController.__before__(self)
         except:
             handle_awful_failure("Error occurred in ErrorController.__before__")
diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
index 3a04459f9..2ded7b698 100644
--- a/r2/r2/controllers/reddit_base.py
+++ b/r2/r2/controllers/reddit_base.py
@@ -433,7 +433,8 @@ class RedditController(BaseController):
         g.cache.caches = (LocalCache(),) + g.cache.caches[1:]
 
         #check if user-agent needs a dose of rate-limiting
-        ratelimit_agents()
+        if not c.error_page:
+            ratelimit_agents()
 
         # the domain has to be set before Cookies get initialized
         set_subreddit()