After you file

I was wondering the address on amended new Form 1040-NR should be the same as the original one, even though I moved out? And I fill in the new address on 1040X in case any communication from IRS?