diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 00132e5f399..2563f2c5382 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1170,12 +1170,9 @@ long WINAPI NdrStubCall2(
         {
         case STUBLESS_CALLSERVER:
             /* call the server function */
-            if (pServerInfo->ThunkTable)
-            {
-                stubMsg.StackTop = args;
+            if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum])
                 pServerInfo->ThunkTable[pRpcMsg->ProcNum](&stubMsg);
                 /* FIXME: RetVal is stored as the last argument - retrieve it */
-            }
             else if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)
             {
                 SERVER_ROUTINE *vtbl = *(SERVER_ROUTINE **)((CStdStubBuffer *)pThis)->pvServerObject;