diff --git a/lib_planes/entities.lua b/lib_planes/entities.lua
index 01b459b..b4ed3fe 100644
--- a/lib_planes/entities.lua
+++ b/lib_planes/entities.lua
@@ -927,7 +927,7 @@ function airutils.on_rightclick(self, clicker)
     --TODO - _autoflymode
     elseif self.driver_name ~= nil or self._autoflymode == true then
         local player = minetest.get_player_by_name(self.driver_name)
-        if player then
+        if player or self._autoflymode == true then
             is_attached = airutils.check_passenger_is_attached(self, name)
 
             if is_attached then