diff --git a/manifests/tag.pp b/manifests/tag.pp
index 95aca31..ede29b6 100644
--- a/manifests/tag.pp
+++ b/manifests/tag.pp
@@ -6,14 +6,17 @@
 
   if $lookup_fact{
     $value = getvar($tag)
+
     if is_array($value){
       $tags = prefix($value, "${tag}:")
       datadog_agent::tag{$tags: }
     } else {
-      concat::fragment{ "datadog tag ${tag}:${value}":
-        target  => '/etc/dd-agent/datadog.conf',
-        content => "${tag}:${value}, ",
-        order   => '03',
+      if $value {
+        concat::fragment{ "datadog tag ${tag}:${value}":
+          target  => '/etc/dd-agent/datadog.conf',
+          content => "${tag}:${value}, ",
+          order   => '03',
+        }
       }
     }
   } else {