diff --git a/src/authm/AuthManager.cc b/src/authm/AuthManager.cc
index 8ed3a16b9b..384e6d4272 100644
--- a/src/authm/AuthManager.cc
+++ b/src/authm/AuthManager.cc
@@ -358,7 +358,7 @@ void AuthManager::timer_action()
 
     while ( it !=auth_requests.end())
     {
-        if (the_time > it->second->time_out)
+        if ((it->second->time_out != 0) && (the_time > it->second->time_out))
         {
             AuthRequest * ar = it->second;
             auth_requests.erase(it++);