Device selection fix to prevent devices changing on start of day