diff --git a/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml b/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml
index 81b5990..e41e3fa 100644
--- a/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml
+++ b/karaf/gshell/gshell-run/src/main/resources/META-INF/spring/gshell-remote.xml
@@ -66,6 +66,11 @@
                 </property>
             </bean>
         </property>
+        <property name="commandFactory">
+            <bean class="org.apache.felix.karaf.gshell.core.sshd.ShellCommandFactory">
+                <property name="executor" ref="commandLineExecutor" />
+            </bean>
+        </property>
         <property name="keyPairProvider" ref="keyPairProvider" />
         <property name="passwordAuthenticator" ref="passwordAuthenticator" />
     </bean>