diff --git a/app/services/handle_chunk_upload.rb b/app/services/handle_chunk_upload.rb
index 78f9a343de2de..75362e54e5922 100644
--- a/app/services/handle_chunk_upload.rb
+++ b/app/services/handle_chunk_upload.rb
@@ -42,8 +42,11 @@ def merge_chunks
     tmp_directory   = @params[:tmp_directory]
 
     # delete destination files
-    File.delete(upload_path)
-    File.delete(tmp_upload_path)
+    begin
+      File.delete(upload_path)
+      File.delete(tmp_upload_path)
+    rescue Errno::ENOENT
+    end
 
     # merge all the chunks
     File.open(tmp_upload_path, "a") do |file|
@@ -59,7 +62,10 @@ def merge_chunks
     FileUtils.mv(tmp_upload_path, upload_path, force: true)
 
     # remove tmp directory
-    FileUtils.rm_rf(tmp_directory)
+    begin
+      FileUtils.rm_rf(tmp_directory)
+    rescue Errno::ENOENT
+    end
   end
 
 end