diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 2c7d8a7d6d04..ec94fd420303 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -48,6 +48,10 @@ function updateSyslogConf()
     python -c "import jinja2, os; paths=['/usr/share/sonic/templates']; loader = jinja2.FileSystemLoader(paths); env = jinja2.Environment(loader=loader, trim_blocks=True); template_file='/usr/share/sonic/templates/rsyslog-container.conf.j2'; template = env.get_template(os.path.basename(template_file)); data=template.render({\"target_ip\":\"$TARGET_IP\",\"container_name\":\"$CONTAINER_NAME\"}); print(data)" > $TMP_FILE
     {%- else %}
     sonic-cfggen -d -t /usr/share/sonic/templates/rsyslog-container.conf.j2 -a "{\"target_ip\": \"$TARGET_IP\", \"container_name\": \"$CONTAINER_NAME\" }"  > $TMP_FILE
+    if [ $? -ne 0 ]; then
+      echo "Error: Execute sonic-cfggen -d failed. Execute without '-d'."
+      sonic-cfggen -t /usr/share/sonic/templates/rsyslog-container.conf.j2 -a "{\"target_ip\": \"$TARGET_IP\", \"container_name\": \"$CONTAINER_NAME\" }"  > $TMP_FILE
+    fi
     {%- endif %}
     docker cp $TMP_FILE ${DOCKERNAME}:/etc/rsyslog.conf
     rm -rf $TMP_FILE
diff --git a/files/image_config/rsyslog/rsyslog-container.conf.j2 b/files/image_config/rsyslog/rsyslog-container.conf.j2
index 4e2c90b548b2..a6419eba846a 100644
--- a/files/image_config/rsyslog/rsyslog-container.conf.j2
+++ b/files/image_config/rsyslog/rsyslog-container.conf.j2
@@ -28,9 +28,13 @@ $ModLoad imuxsock # provides support for local system logging
 
 {% if rate_limit_interval is defined %}
 $SystemLogRateLimitInterval {{ rate_limit_interval }}
+{% else %}
+$SystemLogRateLimitInterval 300
 {% endif %}
 {% if rate_limit_burst is defined %}
 $SystemLogRateLimitBurst {{ rate_limit_burst }}
+{% else %}
+$SystemLogRateLimitBurst 20000
 {% endif %}
 
 #$ModLoad imklog  # provides kernel logging support