diff --git a/LibretroBridge/vs2015/LibretroBridge.cpp b/LibretroBridge/vs2015/LibretroBridge.cpp
index 50698aab6f..3442dc7565 100644
--- a/LibretroBridge/vs2015/LibretroBridge.cpp
+++ b/LibretroBridge/vs2015/LibretroBridge.cpp
@@ -655,9 +655,13 @@ static void LoadHandler(eMessage msg)
 	comm.funs.retro_init();
 
 	retro_game_info rgi;
+	retro_game_info* rgiptr = &rgi;
 	memset(&rgi,0,sizeof(rgi));
 	
-	if (msg == eMessage::CMD_LoadNoGame) {}
+	if (msg == eMessage::CMD_LoadNoGame)
+	{
+		rgiptr = nullptr;
+	}
 	else
 	{
 		rgi.path = (const char*)comm.buf[BufId::Param0];
@@ -668,7 +672,7 @@ static void LoadHandler(eMessage msg)
 		}
 	}
 
-	comm.funs.retro_load_game(&rgi);
+	comm.funs.retro_load_game(rgiptr);
 
 	//Can be called only after retro_load_game() has successfully completed.
 	comm.funs.retro_get_system_av_info(&comm.env.retro_system_av_info);
diff --git a/output/dll/LibretroBridge.dll b/output/dll/LibretroBridge.dll
index e23c9fe43e..1b93178174 100644
Binary files a/output/dll/LibretroBridge.dll and b/output/dll/LibretroBridge.dll differ