diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d75780ad34191d1f61cf384ba4136474855e9ece..67fe5a103a9d21a5e086af9d2edf3ec731fc50fd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Fixed
+~~~~~
+
+* Small files could fail to upload to S3 storage due to MemoryFileUploadHandler
+
 `2.3`_ – 2021-12-15
 -------------------
 
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 3d39fa2890df626e81961250e1157c4033b23f12..f5ec9e4c4c03a0810b6db4f10d1607c47dcb8e35 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -862,10 +862,16 @@ PROMETHEUS_METRICS_EXPORT_ADDRESS = _settings.get("prometheus.metrucs.address",
 
 SECURE_PROXY_SSL_HEADER = ("REQUEST_SCHEME", "https")
 
+FILE_UPLOAD_HANDLERS = [
+    "django.core.files.uploadhandler.MemoryFileUploadHandler",
+    "django.core.files.uploadhandler.TemporaryFileUploadHandler",
+]
+
 if _settings.get("storage.type", "").lower() == "s3":
     INSTALLED_APPS.append("storages")
 
     DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+    FILE_UPLOAD_HANDLERS.remove("django.core.files.uploadhandler.MemoryFileUploadHandler")
 
     if _settings.get("storage.s3.static.enabled", False):
         STATICFILES_STORAGE = "storages.backends.s3boto3.S3StaticStorage"