ARMED police were dispatched to an address in Southhouse after a man was seen with a knife inside the property.
Negotiators took up position outside the house and spent more than six hours persuading the man to come out.
No-one else was in the property and police said there had been no risk to members of the public.
The drama began at 4.30pm yesterday when police received a call to the address in Southhouse Square. It is understood the man was threatening to harm himself. Negotiators eventually resolved the situation at around 11pm and the man was detained under the Mental Health Act.
The drama came days after the siege at a Royal Mile pharmacy when six people were held at knifepoint for three hours.
A police spokesman said: “Police were called to an address in Southhouse Square at around 4.30pm yesterday after concerns were raised regarding the behaviour of a man in a property there.
“Officers spoke with the man and the matter was resolved peacefully.
“Following the incident he was taken to Edinburgh Royal Infirmary.”