diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index c11028e5a65..e4ab5aeb977 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -5211,7 +5211,7 @@ HRESULT WINAPI DirectPlayEnumerateA( LPDPENUMDPCALLBACKA lpEnumCallback,
   {
     /* Hmmm. Does this mean that there are no service providers? */
     ERR(": no service providers?\n");
-    return DP_OK;
+    return DPERR_NOSERVICEPROVIDER;
   }
 
   /* Traverse all the service providers we have available */
diff --git a/winedefault.reg b/winedefault.reg
index d71fb5c67fd..d4ff32fe044 100644
--- a/winedefault.reg
+++ b/winedefault.reg
@@ -957,6 +957,9 @@
 @="dplayx.dll"
 "ThreadingModel"="Both"
 
+[HKEY_LOCAL_MACHINE\Software\Microsoft\DirectPlay\Service Providers] 
+@=""
+
 #
 # Entries used by Internet Explorer installer
 #