diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 2cc7b03c87c..79da9c17156 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2523,7 +2523,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt
                 /* Do nothing, continue with checking the format below */
                 break;
         }
-    }
+    } else if((RType == WINED3DRTYPE_INDEXBUFFER) || (RType == WINED3DRTYPE_VERTEXBUFFER)){
+        /* For instance vertexbuffer/indexbuffer aren't supported yet because no Windows drivers seem to offer it */
+        TRACE_(d3d_caps)("Unhandled resource type D3DRTYPE_INDEXBUFFER / D3DRTYPE_VERTEXBUFFER\n");
+        return WINED3DERR_NOTAVAILABLE;
+     }
 
     /* This format is nothing special and it is supported perfectly.
      * However, ati and nvidia driver on windows do not mark this format as