diff --git a/mariadb/rootfs/etc/services.d/mariadb/run b/mariadb/rootfs/etc/services.d/mariadb/run
index 9305dc1..91b99f4 100644
--- a/mariadb/rootfs/etc/services.d/mariadb/run
+++ b/mariadb/rootfs/etc/services.d/mariadb/run
@@ -126,6 +126,8 @@ fi
 function stop_mariadb() {
     bashio::services.delete "mysql"
     mysqladmin shutdown
+    # Successful exit, avoid wait exit status to propagate
+    exit 0
 }
 trap "stop_mariadb" SIGTERM SIGHUP