1 files changed, 18 insertions, 9 deletions

diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go
index 2de63a3a45..554b01bd40 100644
--- a/models/issues/tracked_time.go
+++ b/models/issues/tracked_time.go
@@ -5,6 +5,7 @@ package issues
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"code.gitea.io/gitea/models/db"
@@ -46,33 +47,41 @@ func (t *TrackedTime) LoadAttributes() (err error) {
 }
 
 func (t *TrackedTime) loadAttributes(ctx context.Context) (err error) {
+	// Load the issue
 	if t.Issue == nil {
 		t.Issue, err = GetIssueByID(ctx, t.IssueID)
-		if err != nil {
-			return
+		if err != nil && !errors.Is(err, util.ErrNotExist) {
+			return err
 		}
+	}
+	// Now load the repo for the issue (which we may have just loaded)
+	if t.Issue != nil {
 		err = t.Issue.LoadRepo(ctx)
-		if err != nil {
-			return
+		if err != nil && !errors.Is(err, util.ErrNotExist) {
+			return err
 		}
 	}
+	// Load the user
 	if t.User == nil {
 		t.User, err = user_model.GetUserByID(ctx, t.UserID)
 		if err != nil {
-			return
+			if !errors.Is(err, util.ErrNotExist) {
+				return err
+			}
+			t.User = user_model.NewGhostUser()
 		}
 	}
-	return err
+	return nil
 }
 
 // LoadAttributes load Issue, User
-func (tl TrackedTimeList) LoadAttributes() (err error) {
+func (tl TrackedTimeList) LoadAttributes() error {
 	for _, t := range tl {
-		if err = t.LoadAttributes(); err != nil {
+		if err := t.LoadAttributes(); err != nil {
 			return err
 		}
 	}
-	return err
+	return nil
 }
 
 // FindTrackedTimesOptions represent the filters for tracked times. If an ID is 0 it will be ignored.