diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f889cb214..f9dea2071 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -328,6 +328,7 @@ class RepositoriesController < ApplicationController
       render json: {
         html: render_to_string(
           partial: 'shared/flash_errors',
+          formats: :html,
           locals: { error_title: t('repositories.import_records.error_message.errors_list_title'),
                     error: t('repositories.import_records.error_message.no_repository_name') }
         )
diff --git a/app/jobs/repository_zip_export_job.rb b/app/jobs/repository_zip_export_job.rb
index 5e16f0850..a63c8bd4d 100644
--- a/app/jobs/repository_zip_export_job.rb
+++ b/app/jobs/repository_zip_export_job.rb
@@ -35,7 +35,7 @@ class RepositoryZipExportJob < ZipExportJob
                                       repository,
                                       nil,
                                       params[:my_module_id].present?)
-    File.binwrite("#{dir}/export.csv", data)
+    File.binwrite("#{dir}/export.csv", data.encode('UTF-8', invalid: :replace, undef: :replace))
   end
 
   def failed_notification_title