Okay, odd side effect. It fixed my inability to Short Rest.

Was Companion X considered in combat all this time?