The new deal was announced by F1 just before first practice at the Marina Bay circuit on Friday.
This weekend's race will be Singapore's 10th grand prix, with the event having made its debut on the calendar in 2008.
"The Singapore Grand Prix is a signature Formula 1 race and therefore we are very pleased that it will continue to feature on the calendar for a further four years," said F1 chairman and CEO Chase Carey.
"The first ever night race in this sport is one of the most thrilling events of the year, taking place against the stunning backdrop of Marina Bay.
"The Singapore Grand Prix, the Singapore Tourism Board and the Singapore Government have all done an excellent job of making this an event that involves the whole city.
"We are looking forward to offering our continued support to make the next four years even more spectacular and exciting."
Singapore's Minister for Trade and Industry S Iswaran emphasised the importance of the race for the city's economy as well as F1.
But, despite talk in the past of the track layout being changed to take in a different area of the city, Iswaran said that no plans for any such alteration were being considered at the moment.