diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c
index 44bb7533a80c..d6737c236b1d 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/sys/boot/i386/libi386/pxe.c
@@ -361,14 +361,20 @@ pxe_cleanup(void)
 		return;
 
 	pxe_call(PXENV_UNDI_SHUTDOWN);
-	if (undi_shutdown_p->Status != 0)
+
+#ifdef PXE_DEBUG
+	if (debug && undi_shutdown_p->Status != 0)
 		printf("pxe_cleanup: UNDI_SHUTDOWN failed %x\n",
-		    undi_shutdown_p->Status);
+		       undi_shutdown_p->Status);
+#endif
 
 	pxe_call(PXENV_UNLOAD_STACK);
-	if (unload_stack_p->Status != 0)
+
+#ifdef PXE_DEBUG	
+	if (debug && unload_stack_p->Status != 0)
 		printf("pxe_cleanup: UNLOAD_STACK failed %x\n",
 		    unload_stack_p->Status);
+#endif
 }
 
 void