diff --git a/internal/gitaly/service/operations/rebase.go b/internal/gitaly/service/operations/rebase.go
index 66d3ac360c9b363059d36e18022eba8124e104d0..f3dcc7b2a7e9b3898387ab17aa75349026fc4792 100644
--- a/internal/gitaly/service/operations/rebase.go
+++ b/internal/gitaly/service/operations/rebase.go
@@ -64,6 +64,7 @@ func (s *Server) UserRebaseConfirmable(stream gitalypb.OperationService_UserReba
 		Committer:        committer,
 		BranchName:       string(header.Branch),
 		UpstreamRevision: startRevision.String(),
+		SkipEmptyCommits: true,
 	})
 	if err != nil {
 		return stream.Send(&gitalypb.UserRebaseConfirmableResponse{