diff --git a/CHANGES b/CHANGES
index e01d1c36a..b7a12d8e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2143,4 +2143,5 @@
 * mail: add option to fts using solr
 * mail: change the namespace separator of new installations to /
 * mail: enable acl
+* Disable THP
 
diff --git a/setup/start.sh b/setup/start.sh
index bd3553869..3a7558251 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -112,6 +112,7 @@ systemctl enable --now cloudron-syslog
 systemctl enable unbound
 systemctl enable box
 systemctl enable cloudron-firewall
+systemctl enable --now cloudron-disable-thp
 
 # update firewall rules
 systemctl restart cloudron-firewall
diff --git a/setup/start/systemd/cloudron-disable-thp.service b/setup/start/systemd/cloudron-disable-thp.service
new file mode 100644
index 000000000..ace1062ac
--- /dev/null
+++ b/setup/start/systemd/cloudron-disable-thp.service
@@ -0,0 +1,14 @@
+# https://docs.mongodb.com/manual/tutorial/transparent-huge-pages/
+[Unit]
+Description=Disable Transparent Huge Pages (THP)
+DefaultDependencies=no
+After=sysinit.target local-fs.target
+Before=docker.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'echo never | tee /sys/kernel/mm/transparent_hugepage/enabled > /dev/null'
+
+[Install]
+WantedBy=basic.target
+