diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 8aeb0e0e8c9..66a7c1ca5e2 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -201,7 +201,9 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno
 struct dispatch_params;
 
 void    RPC_StartRemoting(struct apartment *apt);
-HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **pipebuf);
+HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
+                                DWORD dest_context, void *dest_context_data,
+                                IRpcChannelBuffer **chan);
 HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan);
 void    RPC_ExecuteCall(struct dispatch_params *params);
 HRESULT RPC_RegisterInterface(REFIID riid);
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index 95ff257898b..684d93d91e1 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -1094,7 +1094,10 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt,
         if (hr == E_NOINTERFACE)
         {
             IRpcChannelBuffer *chanbuf;
-            hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, &chanbuf);
+            hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid,
+                                         proxy_manager->dest_context,
+                                         proxy_manager->dest_context_data,
+                                         &chanbuf);
             if (hr == S_OK)
                 hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref,
                                                   riid, chanbuf, &ifproxy);
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index 806c323d4fb..3c5f3ea6740 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -100,6 +100,8 @@ typedef struct
 
     RPC_BINDING_HANDLE     bind; /* handle to the remote server */
     OXID                   oxid; /* apartment in which the channel is valid */
+    DWORD                  dest_context; /* returned from GetDestCtx */
+    LPVOID                 dest_context_data; /* returned from GetDestCtx */
 } ClientRpcChannelBuffer;
 
 struct dispatch_params
@@ -379,7 +381,19 @@ static HRESULT WINAPI ClientRpcChannelBuffer_FreeBuffer(LPRPCCHANNELBUFFER iface
     return HRESULT_FROM_WIN32(status);
 }
 
-static HRESULT WINAPI RpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
+static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
+{
+    ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface;
+
+    TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext);
+
+    *pdwDestContext = This->dest_context;
+    *ppvDestContext = This->dest_context_data;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext)
 {
     FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext);
     return E_FAIL;
@@ -400,7 +414,7 @@ static const IRpcChannelBufferVtbl ClientRpcChannelBufferVtbl =
     ClientRpcChannelBuffer_GetBuffer,
     ClientRpcChannelBuffer_SendReceive,
     ClientRpcChannelBuffer_FreeBuffer,
-    RpcChannelBuffer_GetDestCtx,
+    ClientRpcChannelBuffer_GetDestCtx,
     RpcChannelBuffer_IsConnected
 };
 
@@ -412,12 +426,14 @@ static const IRpcChannelBufferVtbl ServerRpcChannelBufferVtbl =
     ServerRpcChannelBuffer_GetBuffer,
     ServerRpcChannelBuffer_SendReceive,
     ServerRpcChannelBuffer_FreeBuffer,
-    RpcChannelBuffer_GetDestCtx,
+    ServerRpcChannelBuffer_GetDestCtx,
     RpcChannelBuffer_IsConnected
 };
 
 /* returns a channel buffer for proxies */
-HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **chan)
+HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid,
+                                DWORD dest_context, void *dest_context_data,
+                                IRpcChannelBuffer **chan)
 {
     ClientRpcChannelBuffer *This;
     WCHAR                   endpoint[200];
@@ -470,6 +486,8 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelB
     This->super.refs = 1;
     This->bind = bind;
     apartment_getoxid(COM_CurrentApt(), &This->oxid);
+    This->dest_context = dest_context;
+    This->dest_context_data = dest_context_data;
 
     *chan = (IRpcChannelBuffer*)This;