diff --git a/app/controllers/users/headmaps_controller.rb b/app/controllers/users/headmaps_controller.rb
index 81bd5771c..7c88b5681 100644
--- a/app/controllers/users/headmaps_controller.rb
+++ b/app/controllers/users/headmaps_controller.rb
@@ -1,7 +1,7 @@
 class Users::HeadmapsController < Users::BaseController
   def index 
     result = Gitea::User::HeadmapService.call(observed_user.login, start_stamp, end_stamp)
-    @headmaps = result[2]
+    @headmaps = result[2].blank? ? [] : result[2]
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
diff --git a/app/controllers/users/statistics_controller.rb b/app/controllers/users/statistics_controller.rb
index c6cc0d889..592a8be94 100644
--- a/app/controllers/users/statistics_controller.rb
+++ b/app/controllers/users/statistics_controller.rb
@@ -14,7 +14,7 @@ class Users::StatisticsController < Users::BaseController
       @date_data << date.strftime("%Y.%m.%d")
       @issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
       @pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
-      date_commit_data = commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
+      date_commit_data = commit_data.blank? ? nil : commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
       @commit_data << (date_commit_data.blank? ? 0 : date_commit_data[0]["contributions"].to_i)
     end
     render :json => {dates: @date_data, issues_count: @issue_data, pull_requests_count: @pull_request_data, commits_count: @commit_data}