diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index a53e39321..62dac5d37 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -723,7 +723,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uint3
         goto fail;
     }
 
-    if (strcmp(name, u->sink_name))
+    if (!u->sink_name || strcmp(name, u->sink_name))
         return;
 
     pa_xfree(u->device_description);
@@ -836,7 +836,7 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED uin
         goto fail;
     }
 
-    if (strcmp(name, u->source_name))
+    if (!u->source_name || strcmp(name, u->source_name))
         return;
 
     pa_xfree(u->device_description);