Smoking will no longer be allowed within 25 feet of Starbucks storefronts in the United States or Canada starting June 1, NBC Los Angeles reports.

Until now, Starbucks has allowed customers to smoke as long as they are not on the store’s patio. Smoking is banned inside all of the stores.

According to Adweek, the company is also banning electronic cigarettes at its 7,000 U.S. locations.