In the field of Domain Decomposition (DD), Optimized Schwarz Method (OSM) appears to be one of the prominent techniques to solve large scale time-harmonic wave propagation problems. It is based on appropriate transmission conditions using carefully designed impedance operators to exchange information between sub-domains. The efficiency of such methods is however hindered by the presence of cross-points, where more than two sub-domains abut, if no appropriate treatment is provided. In this work, we propose a new treatment of the cross-point issue for the Helmholtz equation that remains valid in any geometrical interface configuration. We exploit the multi-trace formalism to define a new exchange operator with suitable continuity and isometry properties. We then develop a complete theoretical framework that generalizes classical OSM to partitions with cross points and contains a rigorous proof of geometric convergence, uniform with respect to the mesh discretization, for appropriate positive impedance operators. Extensive numerical results in 2D and 3D are provided as an illustration of the performance of the proposed method.