diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index fa6ed4d0c1..92d36af948 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -152,7 +152,10 @@ release_conns_user_server(struct unixuser *xu, struct server *xs)
 			if (sa->natping == tc) {
 			    int cin;
 			    struct afs_conn *tcn;
+			    sa->natping = NULL;
 			    for (tcvn = sa->conns; tcvn; tcvn = tcvn->next) {
+				if (sa->natping != NULL)
+				    break;
 				if (tcvn == tcv)
 				    continue;
 				for(cin = 0; cin < CVEC_LEN; ++cin) {