diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2024-05-23
+
+### Fixed
+
+- Peers timeout more aggressively.
+
 ## [1.1.0] - 2024-03-14
 
 ### Changed
diff --git a/haskoin-node.cabal b/haskoin-node.cabal
--- a/haskoin-node.cabal
+++ b/haskoin-node.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: c56f9a61287f962d4f9870ad229340d99f35d1201e06976dbf99c360cc3b73c4
+-- hash: 6ebc00893fdda0acec1914efa6cf0ba854448b0db92dfd5e464b4d979853592e
 
 name:           haskoin-node
-version:        1.1.0
+version:        1.1.1
 synopsis:       P2P library for Bitcoin and Bitcoin Cash
 description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-node#readme>
 category:       Bitcoin, Finance, Network
diff --git a/src/Haskoin/Node.hs b/src/Haskoin/Node.hs
--- a/src/Haskoin/Node.hs
+++ b/src/Haskoin/Node.hs
@@ -170,7 +170,6 @@
         MHeaders (Headers hs) ->
           chainHeaders p (map fst hs) ch
         _ -> return ()
-      peerMgrTickle p mgr
   publish (PeerEvent event) output
 
 -- | Launch node process in the foreground.
diff --git a/src/Haskoin/Node/PeerMgr.hs b/src/Haskoin/Node/PeerMgr.hs
--- a/src/Haskoin/Node/PeerMgr.hs
+++ b/src/Haskoin/Node/PeerMgr.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
@@ -22,7 +23,6 @@
     peerMgrPong,
     peerMgrAddrs,
     peerMgrVerAck,
-    peerMgrTickle,
     getPeers,
     getOnlinePeer,
     buildVersion,
@@ -68,7 +68,7 @@
 import Data.Bits ((.&.))
 import Data.Function (on)
 import Data.List (dropWhileEnd, elemIndex, find, nub, sort)
-import Data.Maybe (fromMaybe, isJust)
+import Data.Maybe (fromMaybe, isJust, isNothing)
 import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.String.Conversions (cs)
@@ -177,7 +177,6 @@
   | PeerPing !Peer !Word64
   | PeerPong !Peer !Word64
   | PeerAddrs !Peer ![NetworkAddress]
-  | PeerTickle !Peer
 
 -- | Data structure representing an online peer.
 data OnlinePeer = OnlinePeer
@@ -386,14 +385,6 @@
   $(logDebugS) "PeerManager" $
     "Housekeeping for peer " <> p.label
   checkPeer p
-dispatch (PeerTickle p) = do
-  $(logDebugS) "PeerMgr" $
-    "Tickled peer " <> p.label
-  b <- asks (.peers)
-  now <- liftIO getCurrentTime
-  atomically $
-    modifyPeer b p $ \o ->
-      o {tickled = now}
 
 checkPeer :: (MonadManager m, MonadLoggerIO m) => Peer -> m ()
 checkPeer p = do
@@ -402,27 +393,26 @@
   mp <- asks (.peers) >>= atomically . flip findPeer p
   case mp of
     Nothing -> return ()
-    Just o ->
-      liftIO getCurrentTime >>= \now -> do
-        maxLife <- asks (.config.maxPeerLife)
-        let disconnect = maxLife `addUTCTime` o.connected
-        when (now > disconnect) $ do
-          $(logErrorS) "PeerMgr" $
-            "Disconnecting old peer "
-              <> p.label
-              <> " online since "
-              <> cs (show o.connected)
-          killPeer PeerTooOld p
-        timeout <- asks (.config.timeout)
-        let pingTime = timeout `addUTCTime` o.tickled
-        when (now > pingTime) $
-          case o.ping of
-            Nothing ->
-              sendPing p
-            Just _ -> do
-              $(logWarnS) "PeerMgr" $
-                "Peer ping timeout: " <> p.label
-              killPeer PeerTimeout p
+    Just o -> do
+      now <- liftIO getCurrentTime
+      maxLife <- asks (.config.maxPeerLife)
+      let expired = maxLife `addUTCTime` o.connected
+      timeout <- asks (.config.timeout)
+      let deadline = timeout `addUTCTime` o.tickled
+      if
+        | now > expired -> do
+            $(logErrorS) "PeerMgr" $
+              "Disconnecting old peer "
+                <> p.label
+                <> " online since "
+                <> cs (show o.connected)
+            killPeer PeerTooOld p
+        | now > deadline -> do
+            $(logWarnS) "PeerMgr" $ "Peer timeout: " <> p.label
+            killPeer PeerTimeout p
+        | isNothing o.ping ->
+            sendPing p
+        | otherwise -> return ()
 
 sendPing :: (MonadManager m, MonadLoggerIO m) => Peer -> m ()
 sendPing p = do
@@ -585,21 +575,20 @@
       | otherwise = 0
     launch pc busy inbox p =
       ask >>= \mgr ->
-        withPeerLoop sa p mgr $ \a ->
+        withPeerLoop p mgr $ \a ->
           link a >> peer pc busy inbox
 
 withPeerLoop ::
   (MonadUnliftIO m, MonadLogger m) =>
-  SockAddr ->
   Peer ->
   PeerMgr ->
   (Async a -> m a) ->
   m a
-withPeerLoop _ p mgr =
+withPeerLoop p mgr =
   withAsync . forever $ do
-    let x = mgr.config.timeout
-        y = floor (x * 1000000)
-    r <- liftIO $ randomRIO (y * 3 `div` 4, y)
+    let timeout = mgr.config.timeout
+        ms = floor (timeout * 1000 * 1000)
+    r <- liftIO $ randomRIO (ms `div` 4, ms `div` 2)
     threadDelay r
     managerCheck p mgr
 
@@ -644,7 +633,8 @@
       b
       o
         { ping = Nothing,
-          pings = sort $ take 11 $ diff : o.pings
+          pings = sort $ take 11 $ diff : o.pings,
+          tickled = now
         }
 
 setPeerPing :: TVar [OnlinePeer] -> Word64 -> UTCTime -> Peer -> STM ()
@@ -786,14 +776,6 @@
   m ()
 peerMgrAddrs p addrs mgr =
   PeerAddrs p addrs `send` mgr.mailbox
-
-peerMgrTickle ::
-  (MonadIO m) =>
-  Peer ->
-  PeerMgr ->
-  m ()
-peerMgrTickle p mgr =
-  PeerTickle p `send` mgr.mailbox
 
 toHostService :: String -> (Maybe String, Maybe String)
 toHostService str =