diff --git a/cobbler/snippets/kickstart_chef_run.sh b/cobbler/snippets/kickstart_chef_run.sh
index 32136a1..fef691a 100644
--- a/cobbler/snippets/kickstart_chef_run.sh
+++ b/cobbler/snippets/kickstart_chef_run.sh
@@ -76,7 +76,7 @@ EOL
 #if $getVar("compass_server","") != ""
 local3.info @$compass_server:514
 #else
-local3.info @server:514
+local3.info @@$server:514
 #end if
 EOL
                 rm -rf /var/lib/rsyslog/chef_\\$node_log
diff --git a/cobbler/snippets/kickstart_rsyslog.conf b/cobbler/snippets/kickstart_rsyslog.conf
index 247893c..8711acf 100644
--- a/cobbler/snippets/kickstart_rsyslog.conf
+++ b/cobbler/snippets/kickstart_rsyslog.conf
@@ -10,9 +10,9 @@ cat << EOL > /etc/rsyslog.conf
 \\$ActionResumeRetryCount -1
 \\$ActionQueueSaveOnShutDown on
 #if $getVar("compass_server", "") != ""
-*.* @@$compass_server:514
+\# *.* @@$compass_server:514
 #else
-*.* @@$server:514
+\# *.* @@$server:514
 #end if
 
 \# Provides UDP syslog reception
diff --git a/cobbler/snippets/preseed_chef_run.sh b/cobbler/snippets/preseed_chef_run.sh
index ea5b02e..ade6215 100644
--- a/cobbler/snippets/preseed_chef_run.sh
+++ b/cobbler/snippets/preseed_chef_run.sh
@@ -71,7 +71,11 @@ EOL
 \\\\$InputFileFacility local3
 \\\\$InputRunFileMonitor
 \\\\$InputFilePollInterval 1
-local3.info @$server:514
+#if $getVar("compass_server","") != ""
+local3.info @$compass_server:514
+#else
+local3.info @@$server:514
+#end if
 EOL
                 rm -rf /var/lib/rsyslog/chef_\\$node_log
                 service rsyslog restart
diff --git a/cobbler/snippets/preseed_rsyslog.conf b/cobbler/snippets/preseed_rsyslog.conf
index 3a1011f..500d2a8 100644
--- a/cobbler/snippets/preseed_rsyslog.conf
+++ b/cobbler/snippets/preseed_rsyslog.conf
@@ -9,7 +9,11 @@ cat << EOL > /etc/rsyslog.conf
 \\$ActionQueueFileName srvrfwd
 \\$ActionResumeRetryCount -1
 \\$ActionQueueSaveOnShutDown on
-*.* @@$server:514
+#if $getVar("compass_server", "") != ""
+\# *.* @@$compass_server:514
+#else
+\# *.* @@$server:514
+#end if
 
 \# Provides UDP syslog reception
 \#\\$ModLoad imudp
diff --git a/cobbler/snippets/rsyslog.xml b/cobbler/snippets/rsyslog.xml
index e9f488f..4623eb3 100644
--- a/cobbler/snippets/rsyslog.xml
+++ b/cobbler/snippets/rsyslog.xml
@@ -13,9 +13,9 @@
 \$ActionResumeRetryCount -1
 \$ActionQueueSaveOnShutDown on
 #if $getVar("compass_server", "") != ""
-*.* @@$compass_server:514
+\# *.* @@$compass_server:514
 #else
-*.* @@$server:514
+\# *.* @@$server:514
 #end if
 
 \# Provides UDP syslog reception
diff --git a/cobbler/snippets/suse_chef_run.sh b/cobbler/snippets/suse_chef_run.sh
index ea5b02e..ade6215 100644
--- a/cobbler/snippets/suse_chef_run.sh
+++ b/cobbler/snippets/suse_chef_run.sh
@@ -71,7 +71,11 @@ EOL
 \\\\$InputFileFacility local3
 \\\\$InputRunFileMonitor
 \\\\$InputFilePollInterval 1
-local3.info @$server:514
+#if $getVar("compass_server","") != ""
+local3.info @$compass_server:514
+#else
+local3.info @@$server:514
+#end if
 EOL
                 rm -rf /var/lib/rsyslog/chef_\\$node_log
                 service rsyslog restart