Adds id fallback for remote devices