diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp
index 78b660258f..754b3c0ef0 100644
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -10,6 +10,7 @@
 #include "../stdafx.h"
 #include "../gfx_func.h"
 #include "../blitter/factory.hpp"
+#include "../saveload/saveload.h"
 #include "../window_func.h"
 #include "../thread.h"
 #include "null_v.h"
@@ -63,6 +64,12 @@ void VideoDriver_Null::MainLoop()
 			::UpdateWindows();
 		}
 	}
+
+	/* If requested, make a save just before exit. The normal exit-flow is
+	 * not triggered from this driver, so we have to do this manually. */
+	if (_settings_client.gui.autosave_on_exit) {
+		DoExitSave();
+	}
 }
 
 bool VideoDriver_Null::ChangeResolution(int w, int h) { return false; }