diff --git a/console/src/main/java/org/jline/console/impl/SystemHighlighter.java b/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
index c925a1393..7665e83e8 100644
--- a/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
+++ b/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
@@ -27,6 +27,7 @@ public class SystemHighlighter extends DefaultHighlighter {
     private final SyntaxHighlighter commandHighlighter;
     private final SyntaxHighlighter argsHighlighter;
     private final SyntaxHighlighter langHighlighter;
+    private final SystemRegistry systemRegistry;
     private Pattern errorPattern;
     private int errorIndex = -1;
 
@@ -35,6 +36,7 @@ public SystemHighlighter(SyntaxHighlighter commandHighlighter, SyntaxHighlighter
         this.commandHighlighter = commandHighlighter;
         this.argsHighlighter = argsHighlighter;
         this.langHighlighter = langHighlighter;
+        this.systemRegistry = SystemRegistry.get();
     }
 
     @Override
@@ -64,7 +66,7 @@ private AttributedString systemHighlight(Parser parser, String buffer) {
         AttributedString out;
         if (buffer.trim().isEmpty()) {
             out = new AttributedStringBuilder().append(buffer).toAttributedString();
-        } else if (SystemRegistry.get().isCommandOrScript(parser.getCommand(buffer.trim().split("\\s+")[0]))) {
+        } else if (systemRegistry.isCommandOrScript(parser.getCommand(buffer.trim().split("\\s+")[0]))) {
             if (commandHighlighter != null || argsHighlighter != null) {
                 int idx = -1;
                 boolean cmdFound = false;