diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 3a40a59d9c12..044ba0ff0c2d 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1072,7 +1072,7 @@ bootpc_adjust_interface(struct bootpc_ifcontext *ifctx,
 
 	/* Add new default route */
 
-	if (ifctx->gotgw != 0 || gctx->gotgw == 0) {
+	if (ifctx->gw.sin_addr.s_addr != htonl(INADDR_ANY))
 		clear_sinaddr(&defdst);
 		clear_sinaddr(&defmask);
 		/* XXX MRT just table 0 */
@@ -1552,10 +1552,6 @@ bootpc_decode_reply(struct nfsv3_diskless *nd, struct bootpc_ifcontext *ifctx,
 		else
 			ifctx->netmask.sin_addr.s_addr = htonl(IN_CLASSC_NET);
 	}
-	if (ifctx->gotgw == 0) {
-		/* Use proxyarp */
-		ifctx->gw.sin_addr.s_addr = ifctx->myaddr.sin_addr.s_addr;
-	}
 }
 
 void