diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index 8755fb31f4..a3e3ac6aa2 100644
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -1023,7 +1023,7 @@ void rxk_Listener(void)
     rxk_ListenerPid = current->pid;
 #endif
 #ifdef AFS_SUN5_ENV
-    rxk_ListenerPid = ttoproc(curthread)->p_pidp->pid_id;
+    rxk_ListenerPid = curproc->p_pid;
 #endif /* AFS_SUN5_ENV */
 #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
     rxk_ListenerPid = current_proc()->p_pid;
@@ -1046,9 +1046,6 @@ void rxk_Listener(void)
 	    rxp = rxi_ReceivePacket(rxp, rx_socket, host, port);
 	    AFS_RXGUNLOCK();
 	}
-	if (afs_termState == AFSOP_STOP_RXK_LISTENER)
-	    break;
-
     }
 
 #ifdef RX_ENABLE_LOCKS