diff --git a/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs b/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs
index 582fe2f70..33febdb9e 100644
--- a/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs
+++ b/NAPS2.Tools/Project/Packaging/InnoSetupPackager.cs
@@ -26,7 +26,7 @@ public static class InnoSetupPackager
         var defLines = new StringBuilder();
         defLines.AppendLine($"#define AppVersion \"{packageInfo.VersionNumber}\"");
         defLines.AppendLine($"#define AppVersionName \"{packageInfo.VersionName}\"");
-        defLines.AppendLine($"#define AppPlatform \"{packageInfo.PackageName ?? packageInfo.Platform.PackageName()}\"");
+        defLines.AppendLine($"#define AppPlatform \"{packageInfo.PackageName}\"");
         template = template.Replace("; !defs", defLines.ToString());
 
         var arch = new StringBuilder();
diff --git a/NAPS2.Tools/Project/Packaging/PackageInfo.cs b/NAPS2.Tools/Project/Packaging/PackageInfo.cs
index 1d33c5917..ac8c1b256 100644
--- a/NAPS2.Tools/Project/Packaging/PackageInfo.cs
+++ b/NAPS2.Tools/Project/Packaging/PackageInfo.cs
@@ -12,7 +12,7 @@ public class PackageInfo
         Platform = platform;
         VersionName = versionName;
         VersionNumber = versionNumber;
-        PackageName = packageName;
+        PackageName = packageName == null ? platform.PackageName() : $"{platform.PackageName()}-{packageName}";;
     }
 
     public Platform Platform { get; }
@@ -21,7 +21,7 @@ public class PackageInfo
 
     public string VersionNumber { get; }
 
-    public string? PackageName { get; }
+    public string PackageName { get; }
 
     public string GetPath(string ext)
     {