diff --git a/4chan_x.user.js b/4chan_x.user.js
index 9377508ef..42401f8cf 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -4354,7 +4354,7 @@
       var markStale, setOwnTimeout, update;
       setOwnTimeout = function(diff) {
         var delay;
-        delay = diff < $.MINUTE ? diff % $.SECOND : diff < $.HOUR ? diff % $.MINUTE : diff < $.DAY ? diff % $.HOUR : diff % $.DAY;
+        delay = diff < $.MINUTE ? $.SECOND - (diff + $.SECOND / 2) % $.SECOND : diff < $.HOUR ? $.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE : diff < $.DAY ? $.HOUR - (diff + $.HOUR / 2) % $.HOUR : $.DAY - (diff + $.DAY / 2) % $.DAY;
         return setTimeout(markStale, delay);
       };
       update = function(now) {
diff --git a/changelog b/changelog
index 61b3c252e..ec7e5a85d 100644
--- a/changelog
+++ b/changelog
@@ -59,6 +59,10 @@ beta
   Fix user ID highlighting on fetched posts.
 
 master
+
+2.39.0
+- Queue
+  Fix rare bug in Relative Post Dates.
 - Mayhem
   Add Import/Export settings.
 
diff --git a/src/features.coffee b/src/features.coffee
index 55d9a37ae..a03839eb9 100644
--- a/src/features.coffee
+++ b/src/features.coffee
@@ -2897,13 +2897,13 @@ RelativeDates =
   setUpdate: (post) ->
     setOwnTimeout = (diff) ->
       delay = if diff < $.MINUTE
-        diff % $.SECOND
+        $.SECOND - (diff + $.SECOND / 2) % $.SECOND
       else if diff < $.HOUR
-        diff % $.MINUTE
+        $.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE
       else if diff < $.DAY
-        diff % $.HOUR
+        $.HOUR - (diff + $.HOUR / 2) % $.HOUR
       else
-        diff % $.DAY
+        $.DAY - (diff + $.DAY / 2) % $.DAY
       setTimeout markStale, delay
 
     update = (now) ->