diff --git a/app/services/repositories/archive_repository_service.rb b/app/services/repositories/archive_repository_service.rb
index 453668892..4ff24d744 100644
--- a/app/services/repositories/archive_repository_service.rb
+++ b/app/services/repositories/archive_repository_service.rb
@@ -9,11 +9,11 @@ module Repositories
         @repositories.each do |repository|
           repository.archive!(@user)
 
-          RepositoryActions::ArchiveRowsService.call(repository: repository,
-                                                     repository_rows: repository.repository_rows.pluck(:id),
-                                                     user: @user,
-                                                     team: @team,
-                                                     log_activities: false)
+          # rubocop:disable Rails/SkipsModelValidations
+          repository.repository_rows.active.update_all(archived_on: repository.archived_on,
+                                                       archived_by_id: repository.archived_by_id,
+                                                       archived: true)
+          # rubocop:enable Rails/SkipsModelValidations
 
           log_activity(:archive_inventory, repository)
         end
diff --git a/spec/services/repository_actions/archive_repository_service_spec.rb b/spec/services/repository_actions/archive_repository_service_spec.rb
new file mode 100644
index 000000000..384d200b2
--- /dev/null
+++ b/spec/services/repository_actions/archive_repository_service_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Repositories::ArchiveRepositoryService do
+  let(:user) { create :user }
+  let(:team) { create :team }
+  let(:repository) { create :repository, team: team }
+  let!(:row_1) { create :repository_row, repository: repository }
+  let!(:row_2) { create :repository_row, repository: repository }
+  let!(:row_3) { create :repository_row, repository: repository }
+  let(:repositories) { [repository] }
+
+  let(:service_call) do
+    Repositories::ArchiveRepositoryService.call(repositories: repositories, user: user, team: team)
+  end
+
+  context 'when have inventory with rows' do
+    it 'updates repository archived_by, archived_on, archived' do
+      expect { service_call }
+        .to(change { repository.reload.archived_on }
+        .and(change { repository.archived_by })
+        .and(change { repository.archived }))
+    end
+
+    it 'update rows archived_by, archived_on, archived' do
+      expect { service_call }
+        .to(change { row_1.reload.archived_on }
+        .and(change { row_1.archived_by })
+        .and(change { row_1.archived }))
+    end
+
+    it 'creates 1 activity' do
+      expect { service_call }.to change { Activity.count }.by(1)
+    end
+
+    context 'when have archived row' do
+      let!(:row_1) do
+        create :repository_row, :archived, repository: repository
+      end
+
+      it 'does not update row\'s archived_on' do
+        row_1.archived_on = Time.zone.now - 10.days
+        row_1.save
+
+        expect { service_call }.not_to(change { row_1.reload.archived_on })
+      end
+    end
+  end
+
+  context 'when include invalid repository' do
+    let(:second_repository) do
+      r = create :repository, team: team
+      r.name = ''
+      r.save(validate: false)
+      r
+    end
+    let(:repositories) { [repository, second_repository] }
+
+    it 'does not change repository archived' do
+      expect { service_call }.not_to(change { repository.reload.archived_on })
+    end
+
+    it 'does not create activity' do
+      expect { service_call }.not_to(change { Activity.count })
+    end
+
+    it 'returns error' do
+      expect(service_call.errors).to have_key(:archiving_error)
+    end
+  end
+
+  context 'when have invalid item' do
+    let!(:row_1) do
+      r = create :repository_row, repository: repository
+      r.name = ''
+      r.save(validate: false)
+      r
+    end
+
+    it 'archive item anyway' do
+      expect { service_call }.to(change { row_1.reload.archived_on })
+    end
+
+    it 'creates one activity' do
+      expect { service_call }.to change { Activity.count }.by(1)
+    end
+  end
+end