diff --git a/plinth/modules/backups/repository.py b/plinth/modules/backups/repository.py
index d8dbd2f63..79167223f 100644
--- a/plinth/modules/backups/repository.py
+++ b/plinth/modules/backups/repository.py
@@ -317,7 +317,6 @@ class BorgRepository(BaseBorgRepository):
 
     def remove_repository(self):
         """Remove a repository from the kvstore and delete its mountpoint"""
-        self.umount()
         network_storage.delete(self.uuid)
 
 
diff --git a/plinth/modules/backups/views.py b/plinth/modules/backups/views.py
index fda53abbc..aed1668a3 100644
--- a/plinth/modules/backups/views.py
+++ b/plinth/modules/backups/views.py
@@ -470,16 +470,16 @@ class RemoveRepositoryView(SuccessMessageMixin, TemplateView):
         """Return additional context for rendering the template."""
         context = super().get_context_data(**kwargs)
         context['title'] = _('Remove Repository')
-        context['repository'] = SshBorgRepository(uuid=uuid)
+        context['repository'] = create_repository(uuid)
         return context
 
     def post(self, request, uuid):
-        """Delete the archive."""
-        repository = SshBorgRepository(uuid)
+        """Delete the repository on confirmation."""
+        repository = create_repository(uuid)
         repository.remove_repository()
         messages.success(
             request,
-            _('Repository removed. The remote backup itself was not deleted.'))
+            _('Repository removed. Backups were not deleted.'))
 
         return redirect('backups:index')