diff --git a/Dockerfile b/Dockerfile
index 6c0edcd..66549c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,8 @@ RUN \
     libmono-system4.0-cil \
     mono-runtime \
     mono-vbnc \
-    mediainfo && \    
+    mediainfo \
+    xmlstarlet && \    
   echo "**** install sonarr ****" && \
   mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8042dc1..1d8bc5b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -52,7 +52,8 @@ RUN \
     libmono-system4.0-cil \
     mono-runtime \
     mono-vbnc \
-    mediainfo && \    
+    mediainfo \
+    xmlstarlet && \    
   echo "**** install sonarr ****" && \
   mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/data/check b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/data/check
index b752f1e..ad7e6e9 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/data/check
+++ b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/data/check
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-if [[ $(curl -sL "http://localhost:8989/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
+PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+
+if [[ $(curl -sL "http://localhost:${PORT:-8989}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
     exit 0
 else
     exit 1