 On 1 July 2016, having concluded his contract with the Bruins, Gustavsson signed as a free agent to a one-year deal with the Edmonton Oilers to provide backup to starting goaltender Cam Talbot.On 24 March 2017, while playing for the Bakersfield Condors, the AHL affiliate of the Oilers, Gustavsson was credited with scoring a short-handed goal against the San Diego Gulls, as he was the last Condors player to touch the puck before an errant pass by the Gulls caused the puck to go into their own net, as they had pulled their goaltender.After closing out the 2016–17 season, with the Condors in the AHL and having not been recalled to the Oilers post-season roster, Gustavsson as a pending free agent agreed to return to the SHL, in signing a three-year deal to be the starting goaltender for Linköping HC on May 4, 2017.