diff --git a/CHANGELOG.md b/CHANGELOG.md
index 915aea0..4804304 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [TBA](https://github.com/jokay/docker-ccu-historian/releases/tag/TBA) (TBA)
+
+### Improvements
+
+- Improved stop handling. (thx to [@Vrumf0ndel](https://github.com/Vrumf0ndel))
+  ([#318])
+
 ## [3.3.1](https://github.com/jokay/docker-ccu-historian/releases/tag/3.3.1) (2023-03-24)
 
 This release contains CCU-Historian [3.3.1](https://github.com/mdzio/ccu-historian/releases/tag/3.3.1).
@@ -98,7 +105,7 @@ data. ([#10])
 ### Improvements
 
 - Exposed additional ports `8082` (Database Web-GUI Port), `9092` (Database TCP
-Port) and `5435` (Database PostgreSQL Port). ([#13])
+  Port) and `5435` (Database PostgreSQL Port). ([#13])
 
 ## 2.4.0 (2020-06-11)
 
@@ -140,3 +147,4 @@ This release contained CCU-Historian [2.2.0](https://github.com/mdzio/ccu-histor
 [#29]: https://github.com/jokay/docker-ccu-historian/issues/29
 [#140]: https://github.com/jokay/docker-ccu-historian/issues/140
 [#148]: https://github.com/jokay/docker-ccu-historian/issues/148
+[#318]: https://github.com/jokay/docker-ccu-historian/issues/318
diff --git a/src/entrypoint.sh b/src/entrypoint.sh
index bf8a425..953bced 100755
--- a/src/entrypoint.sh
+++ b/src/entrypoint.sh
@@ -74,17 +74,17 @@ if [ -n "${CONFIG_KEEP_MONTHS}" ]; then
 
 	log "Running database maintenance 'clean' (removes all data before ${REF_DATE}) ..."
 	# shellcheck disable=SC2086
-	java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -clean "${REF_DATE}"
+	exec java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -clean "${REF_DATE}"
 fi
 
 if [[ -n "${CONFIG_KEEP_MONTHS}" || "${CONFIG_MAINTENANCE}" == "true" ]]; then
 	log "Running database maintenance 'recalc' ..."
 	# shellcheck disable=SC2086
-	java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -recalc
+	exec java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -recalc
 
 	log "Running database maintenance 'compact' ..."
 	# shellcheck disable=SC2086
-	java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -compact
+	exec java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}" -compact
 fi
 
 log "Starting CCU-Historian using the following config:"
@@ -95,4 +95,4 @@ done <"${FILE_CONFIG}"
 log_sub "---"
 
 # shellcheck disable=SC2086
-java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}"
+exec java ${CONFIG_JAVA_OPTS} -jar "${PATH_BASE}/ccu-historian.jar" -config "${FILE_CONFIG}"