diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index a5535496..b75c46ed 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1490,7 +1490,7 @@ Bool sna_dri_open(struct sna *sna, ScreenPtr screen)
 
 	if (sna->kgem.wedged) {
 		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
-			   "cannot enable DRI2 whilst forcing software fallbacks\n");
+			   "cannot enable DRI2 whilst the GPU is wedged\n");
 		return FALSE;
 	}
 
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index a10c6769..46b95ee8 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -368,6 +368,12 @@ XF86VideoAdaptorPtr sna_video_textured_setup(struct sna *sna,
 		return NULL;
 	}
 
+	if (sna->kgem.wedged) {
+		xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING,
+			   "cannot enable XVideo whilst the GPU is wedged\n");
+		return FALSE;
+	}
+
 	adaptor = calloc(1, sizeof(XF86VideoAdaptorRec));
 	video = calloc(nports, sizeof(struct sna_video));
 	devUnions = calloc(nports, sizeof(DevUnion));