diff --git a/content/opt/supervisor/icinga2_supervisor b/content/opt/supervisor/icinga2_supervisor
index eaf8625..40f9ef4 100755
--- a/content/opt/supervisor/icinga2_supervisor
+++ b/content/opt/supervisor/icinga2_supervisor
@@ -2,6 +2,15 @@
 
 . /opt/helpers
 
+if [ ! -e '/var/run/icinga2' ]; then
+  mkdir /var/run/icinga2
+  mkdir /var/run/icinga2/cmd
+  chown nagios:www-data /var/run/icinga2/cmd
+  chmod 2710 /var/run/icinga2/cmd
+  chown nagios:nagios /var/run/icinga2
+  chmod 0755 /var/run/icinga2
+fi
+
 service icinga2 foreground &
 
 # Kickstart is only possible after icinga2 start -> not in setup script