diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index 09491d6a53..fa603a0867 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <AssemblyName>jellyfin</AssemblyName>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index aef22e020f..73c7a0c7cf 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -134,7 +134,7 @@ namespace Jellyfin.Server
                 Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", logDir);
             }
 
-            string appPath = Assembly.GetEntryAssembly().Location;
+            string appPath = AppContext.BaseDirectory;
 
             return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir);
         }