The present disclosure relates to systems and methods for measuring oil/water content in oil-water mixtures, regardless of the salinity of the mixture and regardless of air in the sensor pipe. In some embodiments, the oil content is measured using a dielectric sensor. It is determined whether the oil content is above or below a threshold. If the oil content is above the threshold, the oil content is reported using the measurement from the dielectric sensor. If the oil content is below the threshold, the oil content is reported using the measurement from the eddy current sensor. In some embodiments, which improve performance when there is air in the sensor pipe, two dielectric sensors with different geometries are used instead of the one dielectric sensor.