diff --git a/DDrawCompat/CompatDirectDraw.cpp b/DDrawCompat/CompatDirectDraw.cpp
index 72c1d55..9094814 100644
--- a/DDrawCompat/CompatDirectDraw.cpp
+++ b/DDrawCompat/CompatDirectDraw.cpp
@@ -107,7 +107,6 @@ HRESULT STDMETHODCALLTYPE CompatDirectDraw<TDirectDraw>::CreateSurface(
 	HRESULT result = DD_OK;
 
 	const bool isPrimary = lpDDSurfaceDesc &&
-		(lpDDSurfaceDesc->dwFlags & DDSD_CAPS) &&
 		(lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE);
 
 	if (isPrimary)
@@ -120,8 +119,7 @@ HRESULT STDMETHODCALLTYPE CompatDirectDraw<TDirectDraw>::CreateSurface(
 		if (lpDDSurfaceDesc &&
 			(lpDDSurfaceDesc->dwFlags & DDSD_WIDTH) &&
 			(lpDDSurfaceDesc->dwFlags & DDSD_HEIGHT) &&
-			!((lpDDSurfaceDesc->dwFlags & DDSD_CAPS) &&
-			(lpDDSurfaceDesc->ddsCaps.dwCaps & (DDSCAPS_ALPHA | DDSCAPS_ZBUFFER))))
+			!(lpDDSurfaceDesc->ddsCaps.dwCaps & (DDSCAPS_ALPHA | DDSCAPS_ZBUFFER)))
 		{
 			CompatPtr<IDirectDraw7> dd(Compat::queryInterface<IDirectDraw7>(This));
 			auto dm = CompatDisplayMode::getDisplayMode(*dd);
@@ -132,9 +130,8 @@ HRESULT STDMETHODCALLTYPE CompatDirectDraw<TDirectDraw>::CreateSurface(
 				desc.dwFlags |= DDSD_PIXELFORMAT;
 				desc.ddpfPixelFormat = dm.ddpfPixelFormat;
 			}
-			if (!((desc.dwFlags & DDSD_CAPS) &&
-				(desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_OVERLAY | DDSCAPS_TEXTURE |
-					DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER))))
+			if (!(desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_OVERLAY | DDSCAPS_TEXTURE |
+					DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER)))
 			{
 				desc.dwFlags |= DDSD_CAPS;
 				desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN;
diff --git a/DDrawCompat/CompatDirectDrawSurface.cpp b/DDrawCompat/CompatDirectDrawSurface.cpp
index 2a8f07a..a613247 100644
--- a/DDrawCompat/CompatDirectDrawSurface.cpp
+++ b/DDrawCompat/CompatDirectDrawSurface.cpp
@@ -21,8 +21,7 @@ namespace
 
 	void fixSurfacePtr(CompatRef<IDirectDrawSurface7> surface, const DDSURFACEDESC2& desc)
 	{
-		if ((desc.dwFlags & DDSD_CAPS) && (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) ||
-			0 == desc.dwWidth || 0 == desc.dwHeight)
+		if ((desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) || 0 == desc.dwWidth || 0 == desc.dwHeight)
 		{
 			return;
 		}