diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index 27dad88cd..3b093d6f6 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -428,10 +428,10 @@ namespace MWMechanics
             
             if (mSaidGreeting == Greet_None)
             {
-                if (playerDistSqr <= helloDistance*helloDistance)
+                if ((playerDistSqr <= helloDistance*helloDistance) && MWBase::Environment::get().getWorld()->getLOS(player, actor)
+                    && MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, actor))
                     greetingTimer++;
                 
-                // TODO: check if actor is aware / has line of sight
                 if (greetingTimer >= GREETING_SHOULD_START)
                 {
                     mSaidGreeting = Greet_InProgress;