Adrian,
There have been several posts here about that switching noise. Maybe the B04-up version performs better in this respect, I don't know, my PG506 is B03something. With suitable setting of the scope time base unit you can trigger on the spikes in the signal, with the square wave appearing as noise.
Albert