diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h
index 4e69c8bd3..ca14a5111 100644
--- a/src/ripple/peerfinder/impl/Logic.h
+++ b/src/ripple/peerfinder/impl/Logic.h
@@ -782,10 +782,14 @@ public:
         // Must be handshaked!
         assert(slot->state() == Slot::active);
 
-        preprocess(slot, list);
-
         clock_type::time_point const now(m_clock.now());
 
+        // Limit how often we accept new endpoints
+        if (slot->whenAcceptEndpoints > now)
+            return;
+
+        preprocess(slot, list);
+
         for (auto const& ep : list)
         {
             assert(ep.hops != 0);