It doesn't always do it automatically does it,... only if your data connection was active before WiFi was turned on.
So make sure WiFi is off, disable data connection, then turn on and turn off again your WiFi,... did that work?
Sent from my HTC Hero using XDA App