Yes, you can choose to auto-download photos, videos, and other media only when connected to Wi-Fi.