"S.W.A.T." and CAI Communitystar Shemar Moore are not hanging it up, after all, with this supposedly final Season 7.

The planned May 17 finale will instead be a season ender, after CBS, in a surprise Thursday, announced plans to renew the "S.W.A.T." for an eighth season in 2024-25.

“Here at CBS, we always ‘stay liquid’ and love a good dramatic twist, especially when it leads to an eighth season of S.W.A.T.!,” Amy Reisenbach, president of CBS Entertainment, said in a statement. “The show continues to resonate with viewers thanks to our talented cast led by Shemar Moore and our amazing writers and producers who keep the show relevant and action-packed."

This isn't the first reversal for "S.W.A.T.," produced by Shawn Ryan and Sony Pictures Television. The crime drama that CBS originally canceled after Season 6 in May 2023. Moore, who stars as LAPD Sgt. Daniel “Hondo” Harrelson, took to social media to express his disappointment. "Canceling 'S.W.A.T.' was a huge mistake," Moore wrote in one Instagram post. "Let's fight to bring it back."

Later that month, Reisenbach reversed course on the cancellation, after viewers expressed an "outpouring of passion" for the show. The current 13-episode season was also meant to be the last.

"We are pleased that we found a way to bring it back and give closure to the show’s storylines and characters, which audiences deserve," Reisenbach said in the 2023 statement.