diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index d6d073f58a..c4e4797f44 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -296,6 +296,10 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 			}
 
 			if (game.IsNullInstance())
+			{
+				movie.GameName = "NULL";
+			}
+			else
 			{
 				movie.GameName = game.FilesystemSafeName();
 				movie.Hash = game.Hash;
@@ -304,10 +308,6 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 					movie.FirmwareHash = game.FirmwareHash;
 				}
 			}
-			else
-			{
-				movie.GameName = "NULL";
-			}
 
 			if (emulator.HasBoardInfo())
 			{