diff --git a/Changelog.md b/Changelog.md
index d823ae3408b51ad83caeecfa27c0f6dcb2094ac8..71826ff7d287a20b4dece007ba66dcb5b217238e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -61,6 +61,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
 ## Features
 * Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)
 * Send new users a welcome message from the podmin [#6128](https://github.com/diaspora/diaspora/pull/6128)
+* Cleanup temporary upload files daily [#6147](https://github.com/diaspora/diaspora/pull/6147)
 
 # 0.5.1.2
 
diff --git a/app/workers/clean_cached_files.rb b/app/workers/clean_cached_files.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3497803d825c0a97461c6aad9128c9a735d5c1ca
--- /dev/null
+++ b/app/workers/clean_cached_files.rb
@@ -0,0 +1,13 @@
+module Workers
+  class CleanCachedFiles < Base
+    include Sidetiq::Schedulable
+
+    sidekiq_options queue: :maintenance
+
+    recurrence { daily }
+
+    def perform
+      CarrierWave.clean_cached_files!
+    end
+  end 
+end