diff --git a/modules/tinder/browser.py b/modules/tinder/browser.py
index 0390008adf34205ca86afc1403a49005e259e58c..b80b299086d982245158d4274af2419ca4564f09 100644
--- a/modules/tinder/browser.py
+++ b/modules/tinder/browser.py
@@ -100,9 +100,19 @@ def like_profile(self):
             return
 
         profile = self.recs.pop()
+
+        if 'tinder_rate_limited' in profile['_id']:
+            self.logger.info(profile['bio'])
+            return 600
+
         resp = self.request('/like/%s' % profile['_id'])
 
         if resp['match']:
             self.logger.error('Match with %s!' % profile['name'])
         else:
             self.logger.info('Liked %s (%r)' % (profile['name'], profile['common_likes']))
+
+        if len(self.recs) > 0:
+            return 1
+        else:
+            return 60
diff --git a/modules/tinder/module.py b/modules/tinder/module.py
index 31d5ddd785b1481c341bcdf694118aeb8004303f..8df11e9e6ea890c256db9f3db729c45d53d30c55 100644
--- a/modules/tinder/module.py
+++ b/modules/tinder/module.py
@@ -58,11 +58,12 @@ def is_running(self):
         return self._view_cron is not None
 
     def view_profile(self):
+        next_try = 1
         try:
-            self._browser.like_profile()
+            next_try = self._browser.like_profile()
         finally:
             if self._view_cron is not None:
-                self._view_cron = self._sched.schedule(1, self.view_profile)
+                self._view_cron = self._sched.schedule(next_try, self.view_profile)
 
 
 class TinderModule(Module, CapMessages, CapMessagesPost, CapDating):