diff --git a/src/wifi/wifid-link.c b/src/wifi/wifid-link.c
index 81cef734..d752e1f3 100644
--- a/src/wifi/wifid-link.c
+++ b/src/wifi/wifid-link.c
@@ -330,7 +330,8 @@ void link_supplicant_started(struct link *l)
 	if (!l || l->public)
 		return;
 
-	link_set_friendly_name(l, l->m->friendly_name);
+   if (l->m->friendly_name)
+	   link_set_friendly_name(l, l->m->friendly_name);
 	log_info("link %s managed", l->ifname);
 }
 
diff --git a/src/wifi/wifid.c b/src/wifi/wifid.c
index 72209f47..7fa8924d 100644
--- a/src/wifi/wifid.c
+++ b/src/wifi/wifid.c
@@ -103,8 +103,10 @@ static void manager_add_udev_link(struct manager *m,
 	if (r < 0)
 		return;
 
-	link_set_friendly_name(l, m->friendly_name);
-	link_set_config_methods(l, m->config_methods);
+   if (m->friendly_name)
+	   link_set_friendly_name(l, m->friendly_name);
+   if (m->config_methods)
+	   link_set_config_methods(l, m->config_methods);
 
     if(use_dev)
         link_use_dev(l);