Don't worry, Caskett fans. Stana Katic will return to Castle this fall, TVGuide.com has learned.

Get your first look at all the new fall shows

Katic joins co-star Nathan Fillion for the upcoming eighth season. However, showrunner David Amann has stepped down, with The Following's Alexi Hawley and Castle writer and producer Terence Paul Winter to share showrunner duties next season. The supporting cast's status for next season remains unclear.

Are you excited Katic is returning?