diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
index 1a9e62781..461e1bfdd 100644
--- a/lib/perfdata/opentsdbwriter.cpp
+++ b/lib/perfdata/opentsdbwriter.cpp
@@ -212,6 +212,14 @@ void OpenTsdbWriter::CheckResultHandler(const Checkable::Ptr& checkable, const C
 					
 					continue;
 				}
+
+				if (value.IsEmpty()) {
+					Log(LogDebug, "OpenTsdbWriter")
+						<< "Resolved macro '" << pair.second
+						<< "' for checkable '" << checkable->GetName() << "' to '', skipping.";
+
+					continue;
+				}
 				
 				String tagname = Convert::ToString(pair.first);
 				tags[tagname] = EscapeTag(value);