diff --git a/src/Runner.Worker/Container/ContainerHooks/HookInput.cs b/src/Runner.Worker/Container/ContainerHooks/HookInput.cs
index 823a3a882..ac390000d 100644
--- a/src/Runner.Worker/Container/ContainerHooks/HookInput.cs
+++ b/src/Runner.Worker/Container/ContainerHooks/HookInput.cs
@@ -83,7 +83,7 @@ namespace GitHub.Runner.Worker.Container.ContainerHooks
         public HookContainer(ContainerInfo container)
         {
             Image = container.ContainerImage;
-            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()) ?? new List<string>();
+            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()).Where(arg => !string.IsNullOrEmpty(arg)) ?? new List<string>();
             EntryPoint = container.ContainerEntryPoint;
             WorkingDirectory = container.ContainerWorkDirectory;
             CreateOptions = container.ContainerCreateOptions;