diff --git a/requirements.txt b/requirements.txt
index 959646f9b..21a1c65f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,5 +4,5 @@ pykwalify==1.6.1
 PyYAML==3.12
 Shapely==1.6.4.post1
 six==1.11.0
-tilecloud==0.5.1
+tilecloud==1.0.1
 python-dateutil==2.6.1  # rq.filter: <2.7.0
diff --git a/tilecloud_chain/generate.py b/tilecloud_chain/generate.py
index 4bb0b8132..bbfaeb99b 100644
--- a/tilecloud_chain/generate.py
+++ b/tilecloud_chain/generate.py
@@ -9,6 +9,7 @@
 from datetime import datetime
 from getpass import getuser
 from argparse import ArgumentParser
+import time
 
 import boto3
 from c2cwsgiutils import stats
@@ -417,8 +418,8 @@ def _get_tilestore_for_layer(self, layer):
 
 def await_message(queue):  # pragma: no cover
     try:
-        while queue.receive_messages(VisibilityTimeout=0, WaitTimeSeconds=20) is None:
-            pass
+        # Just sleep, the SQSTileStore will try again after that...
+        time.sleep(10)
     except KeyboardInterrupt:
         raise StopIteration