diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 6a79974bae9..5e820873d63 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -558,8 +558,10 @@ class TopicsController < ApplicationController
     guardian.ensure_can_change_post_timestamps!
 
     begin
-      PostTimestampChanger.new( topic_id: params[:topic_id].to_i,
-                                timestamp: params[:timestamp].to_i ).change!
+      TopicTimestampChanger.new(
+        topic_id: params[:topic_id].to_i,
+        timestamp: params[:timestamp].to_i
+      ).change!
 
       render json: success_json
     rescue ActiveRecord::RecordInvalid
diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb
index 3b375a3aee1..9127b6841e7 100644
--- a/app/jobs/regular/publish_topic_to_category.rb
+++ b/app/jobs/regular/publish_topic_to_category.rb
@@ -7,7 +7,7 @@ module Jobs
       topic = topic_timer.topic
       return if topic.blank?
 
-      PostTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
+      TopicTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do
         if topic.private_message?
           topic = TopicConverter.new(topic, Discourse.system_user)
             .convert_to_public_topic(topic_timer.category_id)
diff --git a/app/services/post_timestamp_changer.rb b/app/services/topic_timestamp_changer.rb
similarity index 92%
rename from app/services/post_timestamp_changer.rb
rename to app/services/topic_timestamp_changer.rb
index f2a9b3682ae..4755baea2e2 100644
--- a/app/services/post_timestamp_changer.rb
+++ b/app/services/topic_timestamp_changer.rb
@@ -1,4 +1,4 @@
-class PostTimestampChanger
+class TopicTimestampChanger
   def initialize(params)
     @topic = params[:topic] || Topic.with_deleted.find(params[:topic_id])
     @posts = @topic.posts
@@ -9,12 +9,14 @@ class PostTimestampChanger
   def change!
     ActiveRecord::Base.transaction do
       last_posted_at = @timestamp
+      now = Time.zone.now
 
       @posts.each do |post|
         if post.is_first_post?
           update_post(post, @timestamp)
         else
           new_created_at = Time.at(post.created_at.to_f + @time_difference)
+          new_created_at = now if new_created_at > now
           last_posted_at = new_created_at if new_created_at > last_posted_at
           update_post(post, new_created_at)
         end
diff --git a/spec/services/post_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb
similarity index 61%
rename from spec/services/post_timestamp_changer_spec.rb
rename to spec/services/topic_timestamp_changer_spec.rb
index 7c3651bf234..ba77a804f02 100644
--- a/spec/services/post_timestamp_changer_spec.rb
+++ b/spec/services/topic_timestamp_changer_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe PostTimestampChanger do
+describe TopicTimestampChanger do
   describe "change!" do
     let(:old_timestamp) { Time.zone.now }
     let(:new_timestamp) { old_timestamp + 1.day }
@@ -9,25 +9,31 @@ describe PostTimestampChanger do
     let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) }
     let(:params) { { topic_id: topic.id, timestamp: new_timestamp.to_f } }
 
-    it 'changes the timestamp of the topic and opening post' do
-      PostTimestampChanger.new(params).change!
+    context 'new timestamp is in the future' do
+      let(:new_timestamp) { old_timestamp + 2.day }
 
-      topic.reload
-      [:created_at, :updated_at, :bumped_at].each do |column|
-        expect(topic.public_send(column)).to be_within_one_second_of(new_timestamp)
+      it 'changes the timestamp of the topic and opening post' do
+        Timecop.freeze do
+          TopicTimestampChanger.new(params).change!
+
+          topic.reload
+          [:created_at, :updated_at, :bumped_at].each do |column|
+            expect(topic.public_send(column)).to be_within_one_second_of(new_timestamp)
+          end
+
+          p1.reload
+          [:created_at, :updated_at].each do |column|
+            expect(p1.public_send(column)).to be_within_one_second_of(new_timestamp)
+          end
+
+          expect(topic.last_posted_at).to be_within_one_second_of(p2.reload.created_at)
+        end
       end
-
-      p1.reload
-      [:created_at, :updated_at].each do |column|
-        expect(p1.public_send(column)).to be_within_one_second_of(new_timestamp)
-      end
-
-      expect(topic.last_posted_at).to be_within_one_second_of(p2.reload.created_at)
     end
 
     describe 'predated timestamp' do
       it 'updates the timestamp of posts in the topic with the time difference applied' do
-        PostTimestampChanger.new(params).change!
+        TopicTimestampChanger.new(params).change!
 
         p2.reload
         [:created_at, :updated_at].each do |column|
@@ -40,7 +46,7 @@ describe PostTimestampChanger do
       let(:new_timestamp) { old_timestamp - 1.day }
 
       it 'updates the timestamp of posts in the topic with the time difference applied' do
-        PostTimestampChanger.new(params).change!
+        TopicTimestampChanger.new(params).change!
 
         p2.reload
         [:created_at, :updated_at].each do |column|
@@ -53,7 +59,7 @@ describe PostTimestampChanger do
       $redis.set AdminDashboardData.stats_cache_key, "X"
       $redis.set About.stats_cache_key, "X"
 
-      PostTimestampChanger.new(params).change!
+      TopicTimestampChanger.new(params).change!
 
       expect($redis.get(AdminDashboardData.stats_cache_key)).to eq(nil)
       expect($redis.get(About.stats_cache_key)).to eq(nil)