There are a couple of settings you can check to make sure that "download" over wifi isn't checked...
The first is in your market, settings and if "wifi download" is checked, uncheck it. Second is in the phone settings - data manager. If neither of those work, try to clear data / cache for the market app (phone settings, apps, manage apps, all, market)...