diff --git a/app/models/repository_row.rb b/app/models/repository_row.rb
index ce07920e3..b8a57bc9e 100644
--- a/app/models/repository_row.rb
+++ b/app/models/repository_row.rb
@@ -7,7 +7,11 @@ class RepositoryRow < ApplicationRecord
   belongs_to :repository, class_name: 'RepositoryBase'
   belongs_to :created_by, foreign_key: :created_by_id, class_name: 'User'
   belongs_to :last_modified_by, foreign_key: :last_modified_by_id, class_name: 'User'
-  belongs_to :archived_by, foreign_key: :archived_by_id, class_name: 'User', inverse_of: :repository_row, optional: true
+  belongs_to :archived_by,
+             foreign_key: :archived_by_id,
+             class_name: 'User',
+             inverse_of: :archived_repository_rows,
+             optional: true
   has_many :repository_cells, -> { order(:id) }, dependent: :destroy
   has_many :repository_columns, through: :repository_cells
   has_many :my_module_repository_rows,
diff --git a/app/models/user.rb b/app/models/user.rb
index de83c922c..c2b0428e7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -199,10 +199,14 @@ class User < ApplicationRecord
            inverse_of: :restored_by
   has_many :archived_repositories,
            class_name: 'RepositoryBase',
-           foreign_key: 'archived_by_id'
+           foreign_key: 'archived_by_id',
+           inverse_of: :archived_by,
+           dependent: :nullify
   has_many :archived_repository_rows,
            class_name: 'RepositoryRow',
-           foreign_key: 'archived_by_id'
+           foreign_key: 'archived_by_id',
+           inverse_of: :archived_by,
+           dependent: :nullify
   has_many :assigned_my_module_repository_rows,
            class_name: 'MyModuleRepositoryRow',
            foreign_key: 'assigned_by_id'