For ENG-5605, add missing return statement