diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8bc182dbf..8ae6b3b85 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -44,7 +44,6 @@ class RepositoriesController < ApplicationController
   end
 
   def commits
-    @project_owner = @project.owner
     @hash_commit = Gitea::Repository::Commits::ListService.new(@project_owner.login, @project.identifier,
       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7e69e4b10..c62334906 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -96,6 +96,8 @@ class User < ApplicationRecord
     where("LOWER(concat(lastname, firstname, login, mail)) LIKE ?", "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
   }
 
+  scope :simple_select, -> {select(:id, :login, :lastname,:firstname, :nickname)}
+
   attr_accessor :password, :password_confirmation
 
   delegate :gender, :department_id, :school_id, :location, :location_city, :technical_title, to: :user_extension, allow_nil: true
diff --git a/app/views/repositories/commits.json.jbuilder b/app/views/repositories/commits.json.jbuilder
index 0c9442029..6e7f7b330 100644
--- a/app/views/repositories/commits.json.jbuilder
+++ b/app/views/repositories/commits.json.jbuilder
@@ -5,11 +5,19 @@ else
   json.total_count @hash_commit[:total_count]
   json.commits do
     json.array! @hash_commit[:body] do |commit|
+      commit_user = commit['committer']['name']
+      if commit_user 
+        forge_user = User.simple_select.find_by(login: commit_user)
+      end
       json.sha commit['sha']
       json.message commit['commit']['message']
       json.timestamp render_unix_time(commit['commit']['author']['date'])
       json.time_from_now time_from_now(commit['commit']['author']['date'])
-      json.partial! 'author', user: @project_owner
+      if forge_user 
+        json.partial! 'author', user: forge_user 
+      else 
+        json.author nil
+      end
     end
   end
 end