diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 173a30cf20b..4c4c0793256 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -167,7 +167,6 @@ class PostCreator
         create_topic
         save_post
         extract_links
-        store_unique_post_key
         track_topic
         update_topic_stats
         update_topic_auto_close
@@ -182,6 +181,7 @@ class PostCreator
     end
 
     if @post && errors.blank? && !@opts[:import_mode]
+      store_unique_post_key
       # update counters etc.
       @post.topic.reload
 
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 304491c59cc..8774c6402e9 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -580,8 +580,9 @@ describe PostCreator do
 
       it "returns blank for another post with the same content" do
         creator.create
-        new_post_creator.create
-        expect(new_post_creator.errors).to be_present
+        post = new_post_creator.create
+
+        expect(post.errors[:raw]).to include(I18n.t(:just_posted_that))
       end
 
       it "returns a post for admins" do