diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb
index 26b4ce2c6..8d276625e 100644
--- a/app/models/pull_request.rb
+++ b/app/models/pull_request.rb
@@ -34,7 +34,7 @@ class PullRequest < ApplicationRecord
 
   belongs_to :issue
   belongs_to :user
-  belongs_to :project, counter_cache: true, touch: true
+  belongs_to :project, counter_cache: true, touch: true, optional: true
   belongs_to :fork_project, class_name: 'Project', foreign_key: :fork_project_id, optional: true
   has_many :pull_request_assigns, foreign_key: :pull_request_id
   has_many :pull_request_tags, foreign_key: :pull_request_id
diff --git a/app/models/user.rb b/app/models/user.rb
index 988f6d8c2..99fd2372d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -168,8 +168,8 @@ class User < Owner
   has_many :pinned_projects, dependent: :destroy
   has_many :is_pinned_projects, through: :pinned_projects, source: :project
   accepts_nested_attributes_for :is_pinned_projects
-  has_many :issues, dependent: :destroy, foreign_key: :author_id 
-  has_many :pull_requests, dependent: :destroy
+  has_many :issues, foreign_key: :author_id
+  has_many :pull_requests
   has_many :public_keys, class_name: "Gitea::PublicKey",primary_key: :gitea_uid, foreign_key: :owner_id, dependent: :destroy
 
   has_one :user_template_message_setting, dependent: :destroy