diff --git a/Torch.Server/Program.cs b/Torch.Server/Program.cs
index 411caaa4..b0c15526 100644
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Management;
 using System.Net;
 using System.Reflection;
 using System.ServiceProcess;
@@ -62,7 +63,7 @@ public static void Main(string[] args)
                 }
 
                 // Breaks on Windows Server 2019
-                if ((!new ComputerInfo().OSFullName.Contains("Server 2019") && !new ComputerInfo().OSFullName.Contains("Server 2022")) && !Environment.UserInteractive)
+                if (IsRunningAsService())
                 {
                     using (var service = new TorchService(args))
                         ServiceBase.Run(service);
@@ -81,5 +82,20 @@ public static void Main(string[] args)
                 return;
             }
         }
+
+        static bool IsRunningAsService()
+        {
+            // Check if the parent process is services.exe
+            using(var currentProcess = Process.GetCurrentProcess())
+            using(var parentProcess = Process.GetProcessById(GetParentProcessId(currentProcess.Id)))
+                return parentProcess != null && parentProcess.ProcessName.StartsWith("services", StringComparison.OrdinalIgnoreCase);
+        }
+
+        static int GetParentProcessId(int processId)
+        {
+            using(var searcher = new ManagementObjectSearcher($"SELECT ParentProcessId FROM Win32_Process WHERE ProcessId={processId}"))
+            using(var results = searcher.Get())
+                return Convert.ToInt32(results.OfType<ManagementObject>().First()["ParentProcessId"]);
+        }
     }
 }
diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj
index 30f0e82d..0ec2aa57 100644
--- a/Torch.Server/Torch.Server.csproj
+++ b/Torch.Server/Torch.Server.csproj
@@ -148,6 +148,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security.AccessControl, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll</HintPath>
@@ -538,4 +539,4 @@
   <PropertyGroup>
     <PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file