diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index 3fa9ff6801f..faa7552cc3c 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -703,6 +703,9 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetPosition(IDirectSound3DBuffer
 
     TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
 
+    if (isnan(x) || isnan(y) || isnan(z))
+        return DSERR_INVALIDPARAM;
+
     AcquireSRWLockExclusive(&This->lock);
 
     This->ds3db_ds3db.vPosition.x = x;
@@ -961,6 +964,11 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_SetOrientation(IDirectSound3DLi
 
 	TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %ld\n",
 	xFront, yFront, zFront, xTop, yTop, zTop, dwApply);
+
+	if (isnan(xFront) || isnan(yFront) || isnan(zFront)
+		|| isnan(xTop) || isnan(yTop) || isnan(zTop))
+		return DSERR_INVALIDPARAM;
+
 	This->device->ds3dl.vOrientFront.x = xFront;
 	This->device->ds3dl.vOrientFront.y = yFront;
 	This->device->ds3dl.vOrientFront.z = zFront;
diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c
index 9c65f674b3b..0fda7cd524f 100644
--- a/dlls/dsound/tests/ds3d.c
+++ b/dlls/dsound/tests/ds3d.c
@@ -669,6 +669,10 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo,
                     buffer_param.vPosition.x,buffer_param.vPosition.y,
                     buffer_param.vPosition.z,DS3D_IMMEDIATE);
                 ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition() failed: %08lx\n", rc);
+                rc=IDirectSound3DBuffer_SetPosition(buffer,
+                    NAN,NAN,NAN,DS3D_IMMEDIATE);
+                ok(rc==DSERR_INVALIDPARAM,"IDirectSound3dBuffer_SetPosition() returned %08lx\n", rc);
+
             }
         }
         /* Check the sound duration was within 10% of the expected value */
@@ -1350,6 +1354,8 @@ static void check_doppler(IDirectSound *dsound, IDirectSound3DListener *listener
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     hr = IDirectSound3DListener_SetVelocity(listener, 0, 0, 0, DS3D_DEFERRED);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
+    hr = IDirectSound3DListener_SetOrientation(listener, NAN, NAN, NAN, NAN, NAN, NAN, DS3D_DEFERRED);
+    ok(hr == DSERR_INVALIDPARAM, "Got hr %#lx.\n", hr);
     hr = IDirectSound3DBuffer_SetPosition(buffer_3d, 0, 1, 0, DS3D_DEFERRED);
     ok(hr == S_OK, "Got hr %#lx.\n", hr);
     hr = IDirectSound3DBuffer_SetVelocity(buffer_3d, 0, -60, 0, DS3D_DEFERRED);