diff --git a/transition_machine/src/Oracle.cpp b/transition_machine/src/Oracle.cpp
index 73d6fe974982bc835ffb31e8b257062aea74807d..cd686c2d8e46cf63faf0601661ad59eda11347af 100644
--- a/transition_machine/src/Oracle.cpp
+++ b/transition_machine/src/Oracle.cpp
@@ -543,7 +543,11 @@ void Oracle::createDatabase()
     if (previousState == "tagger")
       newState = "morpho";
     else if (previousState == "morpho")
-      newState = "lemmatizer_lookup";
+    {
+      newState = "morpho";
+      if (previousAction == "nothing")
+        newState = "lemmatizer_lookup";
+    }
     else if (previousState == "lemmatizer_lookup")
     {
       if (previousAction == "notfound")