diff --git a/_assets/scripts/gen_config.sh b/_assets/scripts/gen_config.sh
index 4a0269a65..1dbd02894 100755
--- a/_assets/scripts/gen_config.sh
+++ b/_assets/scripts/gen_config.sh
@@ -5,7 +5,7 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 # Settings & defaults
 RPC_PORT="${RPC_PORT:-8545}"
 LISTEN_PORT="${LSTEN_PORT:-30303}"
-API_MODULES="${API_MODULES:-eth,net,web3,admin,mailserver}"
+API_MODULES="${API_MODULES:-eth,web3,admin}"
 FLEET_NAME="${FLEET_NAME:-eth.prod}"
 REGISTER_TOPIC="${REGISTER_TOPIC:-whispermail}"
 MAIL_PASSWORD="${MAIL_PASSWORD:-status-offline-inbox}"
@@ -35,11 +35,6 @@ JQ_FILTER_ARRAY=(
   ".HTTPPort= ${RPC_PORT}"
   ".APIModules = \"${API_MODULES}\""
   ".RegisterTopics = [\"${REGISTER_TOPIC}\"]"
-  ".WhisperConfig.Enabled = true"
-  ".WhisperConfig.EnableMailServer = true"
-  ".WhisperConfig.LightClient = false"
-  ".WhisperConfig.DataDir = \"${DATA_PATH}/whisper\""
-  ".WhisperConfig.MailServerPassword = \"${MAIL_PASSWORD}\""
   ".WakuConfig.Enabled = true"
   ".WakuConfig.EnableMailServer = true"
   ".WakuConfig.DataDir = \"${DATA_PATH}/waku\""