diff --git a/.golangci.yml b/.golangci.yml
index 9f286cd4fe..c29a4208ee 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -200,9 +200,6 @@ linters:
         text: "(ST1005|ST1003|QF1001):"
 
       # TODO: eventually remove this section entirely
-      - path: models/activities/action_list.go
-        linters:
-          - nilnil
       - path: models/asymkey/gpg_key_object_verification.go
         linters:
           - nilnil
@@ -242,9 +239,6 @@ linters:
       - path: models/issues/review.go
         linters:
           - nilnil
-      - path: models/organization/org_user.go
-        linters:
-          - nilnil
       - path: models/quota/rule.go
         linters:
           - nilnil
@@ -299,12 +293,6 @@ linters:
       - path: routers/api/packages/chef/auth.go
         linters:
           - nilnil
-      - path: routers/api/packages/container/auth.go
-        linters:
-          - nilnil
-      - path: routers/api/packages/nuget/auth.go
-        linters:
-          - nilnil
       - path: routers/api/packages/swift/swift.go
         linters:
           - nilnil
@@ -317,9 +305,6 @@ linters:
       - path: routers/web/repo/release.go
         linters:
           - nilnil
-      - path: routers/web/repo/setting/runners.go
-        linters:
-          - nilnil
       - path: routers/web/repo/setting/secrets.go
         linters:
           - nilnil
@@ -335,18 +320,12 @@ linters:
       - path: services/issue/assignee.go
         linters:
           - nilnil
-      - path: routers/api/packages/conan/auth.go
-        linters:
-          - nilnil
       - path: services/issue/commit.go
         linters:
           - nilnil
       - path: services/issue/issue.go
         linters:
           - nilnil
-      - path: services/migrations/onedev.go
-        linters:
-          - nilnil
       - path: services/packages/cargo/index.go
         linters:
           - nilnil
diff --git a/models/activities/action_list.go b/models/activities/action_list.go
index 64b92bbda1..f28cdb5521 100644
--- a/models/activities/action_list.go
+++ b/models/activities/action_list.go
@@ -29,7 +29,7 @@ func (actions ActionList) getUserIDs() []int64 {
 
 func (actions ActionList) LoadActUsers(ctx context.Context) (map[int64]*user_model.User, error) {
 	if len(actions) == 0 {
-		return nil, nil
+		return make(map[int64]*user_model.User), nil
 	}
 
 	userIDs := actions.getUserIDs()
diff --git a/models/organization/org_user.go b/models/organization/org_user.go
index 4c84fccbf3..1389a6b032 100644
--- a/models/organization/org_user.go
+++ b/models/organization/org_user.go
@@ -123,13 +123,13 @@ func IsAnEligibleTeamMemberByID(ctx context.Context, uid int64) (bool, error) {
 
 func loadOrganizationOwners(ctx context.Context, users user_model.UserList, orgID int64) (map[int64]*TeamUser, error) {
 	if len(users) == 0 {
-		return nil, nil
+		return make(map[int64]*TeamUser), nil
 	}
 	ownerTeam, err := GetOwnerTeam(ctx, orgID)
 	if err != nil {
 		if IsErrTeamNotExist(err) {
 			log.Error("Organization does not have owner team: %d", orgID)
-			return nil, nil
+			return make(map[int64]*TeamUser), nil
 		}
 		return nil, err
 	}