diff --git a/debian/systemd/koha-sip@.service b/debian/systemd/koha-sip@.service
index 6071fd2410..6ebca23698 100644
--- a/debian/systemd/koha-sip@.service
+++ b/debian/systemd/koha-sip@.service
@@ -3,8 +3,7 @@ Description=Koha SIP server for %i
 PartOf=koha@%i.target
 Requires=koha-create-dirs@%i.service
 After=koha@%i.target
-ConditionPathExists=/var/lib/koha/%i/sip.enabled
-ConditionPathExists=/etc/koha/sites/%i/SIPconfig.xml
+AssertPathExists=/etc/koha/sites/%i/SIPconfig.xml
 
 [Service]
 Type=simple
@@ -14,6 +13,7 @@ WorkingDirectory=/var/lib/koha/%i
 Environment=KOHA_CONF=/etc/koha/sites/%i/koha-conf.xml
 Environment=KOHA_HOME=/usr/share/koha
 Environment=PERL5LIB=/usr/share/koha/lib
+ExecStartPre=+/bin/sh -c 'test -e /var/lib/koha/%i/sip.enabled || { echo "ERROR: SIP not enabled for instance %i. Use: koha-sip --enable %i" >&2; exit 1; }'
 ExecStart=/usr/bin/perl /usr/share/koha/lib/C4/SIP/SIPServer.pm /etc/koha/sites/%i/SIPconfig.xml
 Restart=on-failure
 RestartSec=30s