diff --git a/src/Runner.Worker/FileCommandManager.cs b/src/Runner.Worker/FileCommandManager.cs
index a01f83f2e..c60c80ee8 100644
--- a/src/Runner.Worker/FileCommandManager.cs
+++ b/src/Runner.Worker/FileCommandManager.cs
@@ -364,8 +364,8 @@ namespace GitHub.Runner.Worker
 
                         output = endIndex > startIndex ? text.Substring(startIndex, endIndex - startIndex) : string.Empty;
                     }
-                    // Normal style NAME=VALUE
-                    else if (equalsIndex >= 0 && heredocIndex < 0)
+                    // Normal style NAME=VALUE, can have << in the value.
+                    else if (equalsIndex >= 0)
                     {
                         var split = line.Split(new[] { '=' }, 2, StringSplitOptions.None);
                         if (string.IsNullOrEmpty(line))
diff --git a/src/Test/L0/Worker/FileCommandTestBase.cs b/src/Test/L0/Worker/FileCommandTestBase.cs
index 1bb0c5bb3..0cada4d1e 100644
--- a/src/Test/L0/Worker/FileCommandTestBase.cs
+++ b/src/Test/L0/Worker/FileCommandTestBase.cs
@@ -242,9 +242,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                     "MY_KEY_6=    <<EOF",
                     "white space test",
                     "EOF",
-                    "MY_KEY_7 << =EOF=",
+                    "MY_KEY_7 <<=EOF=",
                     "abc",
-                    "=EOF="
+                    "=EOF=",
+                    string.Empty
                 };
                 TestUtil.WriteContent(stateFile, content);
                 _fileCmdExtension.ProcessCommand(_executionContext.Object, stateFile, null);