diff --git a/main/main.cpp b/main/main.cpp
index 8960d85c45b..ed6ed019f40 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1704,6 +1704,7 @@ void Main::cleanup() {
 #endif
 
 	if (audio_server) {
+		audio_server->finish();
 		memdelete(audio_server);
 	}
 
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index 5303aea6d07..0d2550e53b3 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -66,7 +66,8 @@ void AudioDriver::audio_server_process(int p_frames, int32_t *p_buffer, bool p_u
 void AudioDriver::update_mix_time(int p_frames) {
 
 	_mix_amount += p_frames;
-	_last_mix_time = OS::get_singleton()->get_ticks_usec();
+	if (OS::get_singleton())
+		_last_mix_time = OS::get_singleton()->get_ticks_usec();
 }
 
 double AudioDriver::get_mix_time() const {