After that, he was assigned to defense the Azuchi-jo Castle and fought against Hidemasa HORI as a rear guard for Mitsuhide in Uchidehama during the Battle of Yamazaki against Hideyoshi TOYOTOMI.
その後、安土城の守備に就き、豊臣秀吉との山崎の合戦では光秀の後詰めとして打ち出浜で堀秀政と戦う。