diff --git a/src/main/kotlin/eu/ibagroup/formainframe/ui/build/tso/utils/InputRecognizer.kt b/src/main/kotlin/eu/ibagroup/formainframe/ui/build/tso/utils/InputRecognizer.kt
index 08798dfd..b4743e79 100644
--- a/src/main/kotlin/eu/ibagroup/formainframe/ui/build/tso/utils/InputRecognizer.kt
+++ b/src/main/kotlin/eu/ibagroup/formainframe/ui/build/tso/utils/InputRecognizer.kt
@@ -39,6 +39,10 @@ class InputRecognizer(
    */
   fun recognizeMessage(command: String) : Message<*> {
     val upperCommand = command.toUpperCasePreservingASCIIRules().trim()
+    if (upperCommand.isEmpty()) {
+      previousCommand = upperCommand
+      return OrdinaryMessage(command, session)
+    }
     val parseExecStm = upperCommand.substringBefore(" ")
     if (parseExecStm == "EX" || parseExecStm == "EXEC" || previousCommand == "EX" || previousCommand == "EXEC") {
       val parseAfterExec = upperCommand.substringAfter(" ").trim()