diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
index 696591f23..c8db8b4e8 100644
--- a/r2/r2/controllers/reddit_base.py
+++ b/r2/r2/controllers/reddit_base.py
@@ -163,8 +163,8 @@ def set_recent_clicks():
         if valid_click_cookie(click_cookie):
             names = [ x for x in UniqueIterator(click_cookie.split(',')) if x ]
 
-            if len(click_cookie) > 1000:
-                names = names[:20]
+            if len(names) > 5:
+                names = names[:5]
                 set_user_cookie('recentclicks2', ','.join(names))
             #eventually this will look at the user preference
             names = names[:5]
diff --git a/r2/r2/public/static/js/reddit.js b/r2/r2/public/static/js/reddit.js
index 8f1a87df6..d01343957 100644
--- a/r2/r2/public/static/js/reddit.js
+++ b/r2/r2/public/static/js/reddit.js
@@ -496,9 +496,9 @@ function add_thing_id_to_cookie(id, cookie_name) {
 
     cookie.data = id + ',' + cookie.data;
 
-    if(cookie.data.length > 1000) {
-        var fullnames = cookie.data.split(',');
-        fullnames = $.uniq(fullnames, 20);
+    var fullnames = cookie.data.split(',');
+    if(fullnames.length > 5) {
+        fullnames = $.uniq(fullnames, 5);
         cookie.data = fullnames.join(',');
     }