diff --git a/libnetwork/endpoint.go b/libnetwork/endpoint.go
index 418017f80d..d52c6bce95 100644
--- a/libnetwork/endpoint.go
+++ b/libnetwork/endpoint.go
@@ -776,9 +776,7 @@ func (ep *endpoint) Delete(force bool) error {
 	}()
 
 	// unwatch for service records
-	if !n.getController().isAgent() {
-		n.getController().unWatchSvcRecord(ep)
-	}
+	n.getController().unWatchSvcRecord(ep)
 
 	if err = ep.deleteEndpoint(force); err != nil && !force {
 		return err