diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 4c6824760c..ee904aca5c 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -341,7 +341,7 @@ entry_guard_describe(const entry_guard_t *guard)
   static char buf[256];
   tor_snprintf(buf, sizeof(buf),
                "%s ($%s)",
-               guard->nickname ? guard->nickname : "[bridge]",
+               strlen(guard->nickname) ? guard->nickname : "[bridge]",
                hex_str(guard->identity, DIGEST_LEN));
   return buf;
 }