diff --git a/Dockerfile b/Dockerfile
index 619b8b2..5cc7d17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -69,7 +69,13 @@ EXPOSE 8080
 
 WORKDIR "/sabnzbd"
 
-HEALTHCHECK --interval="10s" \
-    CMD curl --fail "http://localhost:8080" || exit 1
+# Add Tini
+ENV "TINI_VERSION" "v0.16.1"
+ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
+RUN chmod +x "/tini"
+ENTRYPOINT ["/tini", "--"]
 
 CMD ["/sabnzbd.sh"]
+
+HEALTHCHECK --interval="10s" \
+    CMD curl --fail "http://localhost:8080" || exit 1