diff --git a/src/client/client.c b/src/client/client.c
index 92b7e758..b3c7af2d 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -176,11 +176,12 @@ int GUIAPI ClientRequestEx2 (const REQUEST* request,
     if (mgIsServer)
         return -1;
 
+/*
 #ifdef _MGGAL_MLSHADOW
     if ((request->id != REQID_MLSHADOW_CLIREQ)
             && (__mg_client_id == 0 && request->id != REQID_JOINLAYER)) {
 #elif defined(_MGGAL_NEXUS)
-    if ((request->id != REQID_NEXUS_CLIENT_GET_SURFACE)
+    if ((request->id != REQID_NEXUS_HWSURFACE)
             && (__mg_client_id == 0 && request->id != REQID_JOINLAYER)) {
 #elif defined(_MGSCHEMA_COMPOSITING)
     if (__mg_client_id == 0 && request->id != REQID_JOINLAYER &&
@@ -188,6 +189,8 @@ int GUIAPI ClientRequestEx2 (const REQUEST* request,
 #else
     if (__mg_client_id == 0 && request->id != REQID_JOINLAYER) {
 #endif
+*/
+    if (__mg_client_id == 0 && (request->id & REQMASK_JOINLAYERFIRST)) {
         _ERR_PRINTF ("CLIENT: please call JoinLayer first.\n");
         exit (255);
         return -1;