diff --git a/CHANGES b/CHANGES
index 8c2c8266d..a99ecd3f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2153,4 +2153,5 @@
 * app: add export route
 * mail: on location change, fix lock up when one or more domains have invalid credentials
 * mail: fix crash because of write after timeout closure
+* scaleway: fix installation issue where THP is not enabled in kernel
 
diff --git a/setup/start/cloudron-disable-thp.sh b/setup/start/cloudron-disable-thp.sh
new file mode 100755
index 000000000..4a2b560cc
--- /dev/null
+++ b/setup/start/cloudron-disable-thp.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -eu
+
+echo "==> Disabling THP"
+
+# https://docs.couchbase.com/server/current/install/thp-disable.html
+if [[ -d /sys/kernel/mm/transparent_hugepage ]]; then
+    echo "never" > /sys/kernel/mm/transparent_hugepage/enabled
+    echo "never" > /sys/kernel/mm/transparent_hugepage/defrag
+else
+    echo "==> kernel does not have THP"
+fi
+
diff --git a/setup/start/systemd/cloudron-disable-thp.service b/setup/start/systemd/cloudron-disable-thp.service
index ace1062ac..c412efbd8 100644
--- a/setup/start/systemd/cloudron-disable-thp.service
+++ b/setup/start/systemd/cloudron-disable-thp.service
@@ -7,7 +7,8 @@ Before=docker.service
 
 [Service]
 Type=oneshot
-ExecStart=/bin/sh -c 'echo never | tee /sys/kernel/mm/transparent_hugepage/enabled > /dev/null'
+ExecStart="/home/yellowtent/box/setup/start/cloudron-disable-thp.sh"
+RemainAfterExit=yes
 
 [Install]
 WantedBy=basic.target