diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c
index 55294d04b68..cf30ac3527d 100644
--- a/dlls/msi/custom.c
+++ b/dlls/msi/custom.c
@@ -522,19 +522,22 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
 
     TRACE("%s\n", debugstr_guid( guid ));
 
-    status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str);
-    if (status != RPC_S_OK)
+    if (!rpc_handle)
     {
-        ERR("RpcStringBindingCompose failed: %#x\n", status);
-        return status;
+        status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str);
+        if (status != RPC_S_OK)
+        {
+            ERR("RpcStringBindingCompose failed: %#x\n", status);
+            return status;
+        }
+        status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
+        if (status != RPC_S_OK)
+        {
+            ERR("RpcBindingFromStringBinding failed: %#x\n", status);
+            return status;
+        }
+        RpcStringFreeW(&binding_str);
     }
-    status = RpcBindingFromStringBindingW(binding_str, &rpc_handle);
-    if (status != RPC_S_OK)
-    {
-        ERR("RpcBindingFromStringBinding failed: %#x\n", status);
-        return status;
-    }
-    RpcStringFreeW(&binding_str);
 
     r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package);
     if (r != ERROR_SUCCESS)
@@ -582,8 +585,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid)
     midl_user_free(dll);
     midl_user_free(proc);
 
-    RpcBindingFree(&rpc_handle);
-
     return r;
 }
 
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 9569c4fea2b..1ab52ea5adc 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -344,6 +344,8 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg)
     CloseHandle( package->log_file );
     if (package->rpc_server_started)
         RpcServerUnregisterIf(s_IWineMsiRemote_v0_0_s_ifspec, NULL, FALSE);
+    if (rpc_handle)
+        RpcBindingFree(&rpc_handle);
 
     if (package->delete_on_close) DeleteFileW( package->localfile );
     msi_free( package->localfile );