diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 9be357855..ad67c1d61 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -680,6 +680,9 @@ ProcXvMCGetDRInfo(ClientPtr client)
 static int
 ProcXvMCDispatch(ClientPtr client)
 {
+    if (!(client->local))
+        return BadImplementation;
+
     REQUEST(xReq);
     switch (stuff->data)
     {
@@ -708,13 +711,6 @@ ProcXvMCDispatch(ClientPtr client)
     }
 }
 
-static int _X_COLD
-SProcXvMCDispatch(ClientPtr client)
-{
-    /* We only support local */
-    return BadImplementation;
-}
-
 void
 XvMCExtensionInit(void)
 {
@@ -736,7 +732,7 @@ XvMCExtensionInit(void)
         return;
 
     extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors,
-                            ProcXvMCDispatch, SProcXvMCDispatch,
+                            ProcXvMCDispatch, ProcXvMCDispatch,
                             NULL, StandardMinorOpcode);
 
     if (!extEntry)