diff --git a/legend-engine-config/legend-engine-repl/legend-engine-repl-client-windows/pom.xml b/legend-engine-config/legend-engine-repl/legend-engine-repl-client-windows/pom.xml
new file mode 100644
index 00000000000..83209a28898
--- /dev/null
+++ b/legend-engine-config/legend-engine-repl/legend-engine-repl-client-windows/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2021 Goldman Sachs
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>legend-engine-repl</artifactId>
+        <groupId>org.finos.legend.engine</groupId>
+        <version>4.42.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>legend-engine-repl-client-windows</artifactId>
+    <name>Legend Engine - REPL - Client - Windows</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-repl-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal-jansi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/legend-engine-config/legend-engine-repl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/client/jline3/JLine3Parser.java b/legend-engine-config/legend-engine-repl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/client/jline3/JLine3Parser.java
index eb434dcd24f..0fef62df797 100644
--- a/legend-engine-config/legend-engine-repl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/client/jline3/JLine3Parser.java
+++ b/legend-engine-config/legend-engine-repl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/client/jline3/JLine3Parser.java
@@ -44,7 +44,15 @@ public MyParsedLine(ParserResult result)
         @Override
         public String word()
         {
-            return result.words.get(wordIndex());
+            int index = wordIndex();
+            if (result.words.size() > index)
+            {
+                return result.words.get(index);
+            }
+            else
+            {
+                return "";
+            }
         }
 
         @Override
diff --git a/legend-engine-config/legend-engine-repl/pom.xml b/legend-engine-config/legend-engine-repl/pom.xml
index 36599f2530a..d049d459d8b 100644
--- a/legend-engine-config/legend-engine-repl/pom.xml
+++ b/legend-engine-config/legend-engine-repl/pom.xml
@@ -28,6 +28,7 @@
 
     <modules>
         <module>legend-engine-repl-client</module>
+        <module>legend-engine-repl-client-windows</module>
         <module>legend-engine-repl-relational</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ca42dfbdc1c..1a6cc973be8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3550,6 +3550,16 @@
                 <artifactId>jline</artifactId>
                 <version>3.25.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.jline</groupId>
+                <artifactId>jline-terminal-jansi</artifactId>
+                <version>3.25.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.fusesource.jansi</groupId>
+                <artifactId>jansi</artifactId>
+                <version>2.4.1</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>