Samsung Galaxy Watch 7 will go back to the square design. It could happen with the Samsung Galaxy Watch 7 or later.

Source: Youtube