diff --git a/src/teleport-browser.c b/src/teleport-browser.c
index a24e386..fd43f15 100644
--- a/src/teleport-browser.c
+++ b/src/teleport-browser.c
@@ -156,7 +156,7 @@ client_callback (AvahiClient *c,
     fprintf(stderr,
             "Server connection failure: %s\n",
             avahi_strerror(avahi_client_errno(c)));
-    teleport_browser_avahi_shutdown();
+    avahi_client_free(client);
   }
 }
 
diff --git a/src/teleport-publish.c b/src/teleport-publish.c
index 8c95fef..cb82b1b 100644
--- a/src/teleport-publish.c
+++ b/src/teleport-publish.c
@@ -174,8 +174,8 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
   case AVAHI_CLIENT_FAILURE:
 
     fprintf(stderr, "Client failure: %s\n", avahi_strerror(avahi_client_errno(c)));
-    //avahi_simple_poll_quit(simple_poll);
-    teleport_publish_shutdown();
+    avahi_client_free(client);
+    avahi_free(name);
 
     break;