diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index a2b5540a576..2682045dad3 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -158,7 +158,7 @@ class PostMover
 
     message = I18n.with_locale(SiteSetting.default_locale) do
       I18n.t("move_posts.#{move_type_str}_moderator_post",
-             count: post_ids.count,
+             count: posts.length,
              topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})")
     end
 
@@ -172,7 +172,10 @@ class PostMover
 
   def posts
     @posts ||= begin
-      Post.where(topic: @original_topic, id: post_ids).order(:created_at).tap do |posts|
+      Post.where(topic: @original_topic, id: post_ids)
+        .where.not(post_type: Post.types[:small_action])
+        .order(:created_at).tap do |posts|
+
         raise Discourse::InvalidParameters.new(:post_ids) if posts.empty?
       end
     end
diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb
index 0fdcf26da5e..3e44fa33489 100644
--- a/spec/models/post_mover_spec.rb
+++ b/spec/models/post_mover_spec.rb
@@ -247,6 +247,17 @@ describe PostMover do
 
           expect(post.raw).to eq(expected_text)
         end
+
+        it "does not try to move small action posts" do
+          small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
+          new_topic = topic.move_posts(user, [p2.id, p4.id, small_action.id], title: "new testing topic name", category_id: category.id)
+
+          expect(new_topic.posts_count).to eq(2)
+          expect(small_action.topic_id).to eq(topic.id)
+
+          moderator_post = topic.posts.last
+          expect(moderator_post.raw).to include("2 posts were split")
+        end
       end
 
       context "to an existing topic" do
@@ -309,6 +320,18 @@ describe PostMover do
           topic.reload
           expect(topic.closed).to eq(true)
         end
+
+        it "does not try to move small action posts" do
+          small_action = Fabricate(:post, topic: topic, raw: "A small action", post_type: Post.types[:small_action])
+          moved_to = topic.move_posts(user, [p1.id, p2.id, p3.id, p4.id, small_action.id], destination_topic_id: destination_topic.id)
+
+          moved_to.reload
+          expect(moved_to.posts_count).to eq(5)
+          expect(small_action.topic_id).to eq(topic.id)
+
+          moderator_post = topic.posts.find_by(post_number: 2)
+          expect(moderator_post.raw).to include("4 posts were merged")
+        end
       end
 
       context "moving the first post" do