A small service was held at the Garden of Remembrance, and the Last Post was performed by bugler Iona Macfarlane, a medical student at the University of Edinburgh.
At 11am, the One O’clock Gun fired at Edinburgh Castle and a two minute silence was held. Wreaths were then laid by the Right Honourable Lord Provost and Lord Lieutenant of the City of Edinburgh, Robert Aldridge.
Dr Claire Armstrong, CEO of Legion Scotland, said: “It is paramount that, as a society, and as a community, we reflect on such a significant day in history.
“Armistice day was the day on which the ‘War to End all Wars’ ceased. Of course, the First World War was not the last. Today, 105 years on, there is war in Europe.
“We must remember the trauma, we must reflect on the barbarity, and we must remember that what many hundreds of thousands of men and women experienced in the First World War should be confined to the dustbins of history.
“But it isn’t. This is why, as a country, and as an organisation, we will never forget the sacrifices that have been made for so many, for the sake of so few.
“These sacrifices are made on a daily occurrence by our Armed Forces community, and they are made on our behalf. This selflessness should be remembered daily, and today, of all days, I wish to thank our Armed Forces community for their continued dedication to our values and our freedoms.”
It comes as protests took place across Scotland calling for a ceasefire in the conflict between Israel and Hamas in Gaza.
In Edinburgh, hundreds gathered for a pro-Palestine march which started on Waverley Bridge at 12pm.
Similar demonstrations went ahead throughout the day across the UK, including in Glasgow, London, Aberdeen and Dundee, despite condemnation from the UK Government.
Rishi Sunak called the protests “provocative and disrespectful” while Home Secretary Suella Braverman described people taking part as “hate marchers”.
However, others including First Minister Humza Yousaf pointed out Armistice Day is an appropriate time to call for peace.
Saying the plans should go ahead, Mr Yousaf said: “Describing those marches as hate marches is disgraceful, unacceptable. If Armistice was about anything, my goodness, it’s about peace.”
Armistice Day is held on the 11th day of the 11th month every year to mark the agreement which brought about the end of the First World War.
Remembrance Sunday will take place on November 12 this year, with a large ceremony being held in Edinburgh.
Crowds will gather at the Stone of Remembrance at Edinburgh City Chambers and from 10am a parade will be held by military personnel at the Castle Esplanade.
At 11am a single round will be fired from a gun at Edinburgh Castle and a two minute silence will be held.
Then, wreaths will be laid at the Stone of Remembrance by veterans, dignitaries, and representatives of the Scottish Government.