diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/SwitchUnitAction.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/SwitchUnitAction.java
index 94d193a..817446c 100644
--- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/SwitchUnitAction.java
+++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/SwitchUnitAction.java
@@ -15,14 +15,16 @@ public class SwitchUnitAction implements ActionUnit<SwitchUnit<Message>, Message
 
     @Override
     public Uni<UnitRequest<MainUnit, Message>> action(UnitRequest<SwitchUnit<Message>, Message> unitRequest) {
+        final SwitchUnit<Message> unit = unitRequest.getUnit();
         final Message message = unitRequest.getMessage();
-        final Set<MainUnit<Message>> nextUnits = unitRequest.getUnit().getNextUnits();
+
+        final Set<MainUnit<Message>> nextUnits = unit.getNextUnits();
         return Responder.nextUnit(message, nextUnits)
                 .map(nextUnit -> {
                     if (checkNotNull(nextUnit)) {
                         return UnitRequest.of(nextUnit, message);
                     }
-                    return null;
+                    return UnitRequest.of(unit, message);
                 });
     }