diff --git a/package/etc/conf.d/sources/source_syslog/plugin.jinja b/package/etc/conf.d/sources/source_syslog/plugin.jinja
index 6f66009b9c..5be8c6d629 100644
--- a/package/etc/conf.d/sources/source_syslog/plugin.jinja
+++ b/package/etc/conf.d/sources/source_syslog/plugin.jinja
@@ -221,12 +221,13 @@ source s_{{ port_id }} {
             rewrite {
                 set('$(lowercase "$HOST")' value(HOST));
             };
-            {%- if not vendor or not product %}
-            {%- if use_vpscache == True %}
+            {%- if ( (not vendor or not product) and
+                     (use_vpscache == True) ) %}
             if {
                 parser(p_vpst_cache);
             };
             {%- endif %}
+            {%- if vendor and product %}
             if {
                 parser(vendor_product_by_source);
             };
@@ -428,12 +429,13 @@ source s_{{ port_id }} {
         rewrite {
             set('$(lowercase "$HOST")' value(HOST));
         };
-        {%- if not vendor or not product %}
-        {%- if use_vpscache == True %}
+        {%- if ( (not vendor or not product) and
+               (use_vpscache == True) ) %}
         if {
             parser(p_vpst_cache);
         };
         {%- endif %}
+        {%- if vendor and product %}
         if {
             parser(vendor_product_by_source);
         };
@@ -481,4 +483,4 @@ source s_{{ port_id }} {
         };
     };
     {%- endif %}
-};
\ No newline at end of file
+};