diff --git a/scripts/resources/pkg/suwayomi-server.sh b/scripts/resources/pkg/suwayomi-server.sh
index 30792184..981ec5de 100644
--- a/scripts/resources/pkg/suwayomi-server.sh
+++ b/scripts/resources/pkg/suwayomi-server.sh
@@ -1,4 +1,10 @@
 #!/bin/sh
 
 export LD_PRELOAD="/usr/share/java/suwayomi-server/bin/catch_abort.so"
-exec /usr/bin/java -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
+
+if [ -z "$DISPLAY" ] && command -v Xvfb >/dev/null; then
+  echo "-- START: Spawning X server using xvfb-run --"
+  exec xvfb-run /usr/bin/java "$@" -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
+else
+  exec /usr/bin/java "$@" -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
+fi
diff --git a/scripts/resources/pkg/systemd/suwayomi-server.service b/scripts/resources/pkg/systemd/suwayomi-server.service
index 1020800e..16852960 100644
--- a/scripts/resources/pkg/systemd/suwayomi-server.service
+++ b/scripts/resources/pkg/systemd/suwayomi-server.service
@@ -10,7 +10,7 @@ Group=suwayomi-server
 SyslogIdentifier=suwayomi-server
 
 EnvironmentFile=/etc/suwayomi/server.conf
-ExecStart=/usr/bin/java $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}" -jar /usr/share/java/suwayomi-server/bin/Suwayomi-Server.jar
+ExecStart=/usr/bin/suwayomi-server $JAVA_ARGS -Dsuwayomi.tachidesk.config.server.rootDir="${TACHIDESK_ROOT_DIR}"
 Restart=on-failure
 
 ProtectSystem=full