diff --git a/src/Dotnet.Script.Core/DebugScriptRunner.cs b/src/Dotnet.Script.Core/DebugScriptRunner.cs
index 8b661c18..c299bbc5 100644
--- a/src/Dotnet.Script.Core/DebugScriptRunner.cs
+++ b/src/Dotnet.Script.Core/DebugScriptRunner.cs
@@ -34,7 +34,7 @@ public override Task<TReturn> Execute<TReturn, THost>(ScriptContext context, THo
             {
                 // https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L19
                 var encodingField = syntaxTree.GetType().GetField("_encodingOpt", BindingFlags.Instance | BindingFlags.NonPublic);
-                encodingField.SetValue(syntaxTree, Encoding.UTF8);
+                encodingField.SetValue(syntaxTree, context.Code.Encoding);
 
                 // https://github.com/dotnet/roslyn/blob/version-2.0.0-beta4/src/Compilers/CSharp/Portable/Syntax/CSharpSyntaxTree.ParsedSyntaxTree.cs#L21
                 var lazyTextField = syntaxTree.GetType().GetField("_lazyText", BindingFlags.Instance | BindingFlags.NonPublic);
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
index 07837038..a04a9582 100644
--- a/src/Dotnet.Script/Program.cs
+++ b/src/Dotnet.Script/Program.cs
@@ -86,7 +86,7 @@ private static void RunScript(string file, string config, bool debugMode, IEnume
             }
 
             var directory = Path.IsPathRooted(file) ? Path.GetDirectoryName(file) : Path.GetDirectoryName(Path.Combine(Directory.GetCurrentDirectory(), file));
-            var sourceText = SourceText.From(new FileStream(file, FileMode.Open), Encoding.UTF8);
+            var sourceText = SourceText.From(new FileStream(file, FileMode.Open));
             var context = new ScriptContext(sourceText, directory, config, args, file);
 
             Run(debugMode, context);
@@ -94,7 +94,7 @@ private static void RunScript(string file, string config, bool debugMode, IEnume
 
         private static void RunCode(string code, string config, bool debugMode, IEnumerable<string> args, string currentWorkingDirectory)
         {
-            var sourceText = SourceText.From(code, Encoding.UTF8);
+            var sourceText = SourceText.From(code);
             var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), config, args);
 
             Run(debugMode, context);