Sqn Ldr Andrew Geddes took over command of the squadron on 1 May 39 and could lay claim to being one of that small group of RAF officers - excluding the pre-April 1918 RFC and RNAS officers - who started their military careers in the Army. As a serving member of the Honourable Company of the Royal Artillery he was seconded to the RAF in 1928 to be trained at RAF Sealand. After a spell with No. 4 Squadron at Farnborough flying Bristol F2B's and later the Armstrong Whitworth Atlas I's he returned to serve with the Royal Artillery in 1932. In 1935 he was again seconded to the RAF, this time as a Flight Commander with Shiney Two at Manston eventually becoming squadron commander in 1939.
He was renowned as a “Colourful Character” and was Boss when the country went to war. Promoted to Wing Commander in March 1940 he continued to lead the squadron until December 1941 when he handed over to Wg Cdr Riddell.