diff --git a/manifests/init.pp b/manifests/init.pp
index b28d1fdeac28d84a1e062586e0b33870740644b6..09ca6b391522d99714c38cd10672c2e6002a842f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -83,7 +83,7 @@ define tsmclient($serveraddress=undef, $nodename=$fqdn,
 	$tsmclient::config::default_inclexcl,
 	$inclexcl)
 
-    if $serveraddress {
+    if $serveraddress and $serveraddress != '' {
 	$tsm_serveraddress = $serveraddress
     } elsif ($tsmclient::config::tsmservers  and
 	     $name in $tsmclient::config::tsmservers) {