diff --git a/postgres/rootfs/etc/cont-init.d/99-run.sh b/postgres/rootfs/etc/cont-init.d/99-run.sh
index 44ea2f150..bbe6bb4fc 100755
--- a/postgres/rootfs/etc/cont-init.d/99-run.sh
+++ b/postgres/rootfs/etc/cont-init.d/99-run.sh
@@ -34,22 +34,11 @@ cd /config || true
 
 bashio::log.info "Starting the app"
 
-function shutdown_postgres {
-    echo "Received SIGTERM/SIGINT, shutting down PostgreSQL..."
-    gosu postgres pg_ctl -D "$PGDATA" -m fast stop
-    exit 0
-}
-
-trap 'shutdown_postgres' SIGTERM SIGINT
-
 # Start background tasks
 if [ "$(bashio::info.arch)" != "armv7" ]; then
     /./docker-entrypoint-initdb.d/10-vector.sh & true
-
     docker-entrypoint.sh postgres -c shared_preload_libraries=vectors.so & true
 else
     bashio::log.warning "ARMv7 detected: Starting without vectors.so"
     docker-entrypoint.sh postgres & true
 fi
-
-while :; do sleep infinity & wait $!; done