Use a glass bottle, try to fill it up as much as you can with solvent + basic soup (minimize amount of air) and roll it gently on something soft like a carpet for couple of minutes. This breaks the existing emulsion and avoids creating new one. Let the bottle rest and repeat the rolling like 10 times. DO NOT SHAKE!
Additionally, heating your mix in waterbath to bring the solvent to almost boiling point will break the emulsion.
Gate Gate Pāragate Pārasaṃgate Bodhi Svāhā