On Thursday, Iran called Switzerland's ambassador - who represents the United States in Tehran - in protest of the escalated tone, and President Donald Trump in turn was clear during Thursday's press conference.
"If Iranian boats get too close, then we will shoot," he said.
But what is the conflict about and why is it pending right now?
Hear SVT's Middle Eastern correspondent Stina Blomgren explain the situation in the clip above.