When the emulsion does its job at first use, I think the problem you mentioned does not lay in fabrication. Maybe you are heating the whole bottle every time you are pouring? It is better to heat only the portion you need exactly for one job. Also overheating can damage the emulsion. And storing in a refrigerator is a better way. A wrong safe light can also cause damage.