diff --git a/src/i830_display.c b/src/i830_display.c
index ed49fb0..b25b9b8 100644
--- a/src/i830_display.c
+++ b/src/i830_display.c
@@ -896,6 +896,9 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	}
 	/* Wait for the clocks to turn off. */
 	usleep(150);
+
+	/* Clear any FIFO underrun status that may have occurred normally */
+	OUTREG(pipestat_reg, INREG(pipestat_reg) | FIFO_UNDERRUN);
 	break;
     }