The federal Drug Enforcement Agency has found a new home in downtown Buffalo, ending a simmering dispute between the U.S. government and the owners of the historic Guaranty Building.

The General Services Administration, the federal real estate procurement agency, has signed a 10-year lease with Iskalo Development for the DEA to occupy 26,584 square feet in the Electric Tower Building along Washington Street. The DEA is expected to move into the Electric Tower by early summer.

The deal marks the end of a dispute between the GSA and the Buffalo law firm of Hodgson Russ LLP concerning leased space in the Guaranty Building. A group of Hodgson Russ lawyers acquired the 110-year-old Louis Sullivan-designed building with the intent of the law firm occupying all 13 floors.

The GSA delayed finding new downtown homes for the DEA and the Internal Revenue Service, putting Hodgson Russ' plans in a holding pattern and prompting a series of lawsuits, as well as attempts at congressional intervention from Rep. Brian Higgins, D-Buffalo.

In October, the GSA agreed to move the IRS to 13,000 square feet in the Olympic Towers and promised to find a new home for the GSA before the end of the year.

As part of the Iskalo deal, the DEA will receive 52 dedicated parking spaces.