diff --git a/src/app/backend/pcmanager/discovery/discovery_libmicrodns.c b/src/app/backend/pcmanager/discovery/discovery_libmicrodns.c
index ac3e4e604..f8a8c9763 100644
--- a/src/app/backend/pcmanager/discovery/discovery_libmicrodns.c
+++ b/src/app/backend/pcmanager/discovery/discovery_libmicrodns.c
@@ -100,6 +100,8 @@ static void discovery_callback(discovery_task_t *task, int status, const struct
             }
             case RR_AAAA: {
                 if (addr->sa_family != AF_UNSPEC) { continue; }
+                // Ignore any link-local addresses
+                if (IN6_IS_ADDR_LINKLOCAL(&cur->data.AAAA.addr)) { continue; }
                 sockaddr_set_ip(addr, AF_INET6, &cur->data.AAAA.addr);
                 break;
             }
diff --git a/third_party/commons b/third_party/commons
index a4f9ca116..cb010e91e 160000
--- a/third_party/commons
+++ b/third_party/commons
@@ -1 +1 @@
-Subproject commit a4f9ca116fa49a612000ed0fb88385d4d4edfcba
+Subproject commit cb010e91e46044d29a12d63efbdae75c13f0ffd2