After Poland regained her independence in 1918, the internal design of the castle was yet again modified. Since the 1920s it housed several parts of the Warsaw NCO school. The main staircase was restored to its 18th-century representative design. An interesting feature of the staircase was a set of stone tablets placed there May 15, 1927, commemorating the names of all known Polish military medics who perished in wars between 1797 and 1920. Additional tablets commemorated Karol Kaczkowski, Zdzisław Lubaszewski and a sculpture by Edward Wittig commemorating all military medics. After the Polish Defensive War of 1939, the Red Cross organized a school for WIA soldiers. The castle was burnt out and damaged by the Germans following the Warsaw Uprising of 1944.