diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+- 0.10.1.0
+    * Fix issues with timeout tickling
+
 - 0.10.0.0
     * Bump snap-core and snap-server to 1.0.0.0
     * Remove git submodules; use hackage for all dependencies
diff --git a/src/Network/WebSockets/Snap.hs b/src/Network/WebSockets/Snap.hs
--- a/src/Network/WebSockets/Snap.hs
+++ b/src/Network/WebSockets/Snap.hs
@@ -71,7 +71,7 @@
   Snap.escapeHttp $ \tickle readEnd writeEnd -> do
 
     thisThread <- myThreadId
-    stream <- WS.makeStream (tickle (max 20) >> Streams.read readEnd)
+    stream <- WS.makeStream (Streams.read readEnd)
               (\v -> do
                   Streams.write (fmap BSBuilder.lazyByteString v) writeEnd
                   Streams.write (Just BSBuilder.flush) writeEnd
@@ -79,7 +79,7 @@
 
     let options' = options
                    { WS.connectionOnPong = do
-                        tickle (max 30)
+                        tickle (max 45)
                         WS.connectionOnPong options
                    }
 
@@ -101,7 +101,7 @@
   where
     pingThread = handle ignore $ forever $ do
         WS.sendPing conn (BC.pack "ping")
-        tickle (min 15)
+        tickle (max 15)
         threadDelay $ 30 * 1000 * 1000
 
     ignore :: SomeException -> IO ()
diff --git a/websockets-snap.cabal b/websockets-snap.cabal
--- a/websockets-snap.cabal
+++ b/websockets-snap.cabal
@@ -1,5 +1,5 @@
 Name:          websockets-snap
-Version:       0.10.0.0
+Version:       0.10.1.0
 Synopsis:      Snap integration for the websockets library
 Description:   Snap integration for the websockets library
 License:       BSD3