diff --git a/altrank.py b/altrank.py
index a7ed140..4b7fcad 100755
--- a/altrank.py
+++ b/altrank.py
@@ -445,11 +445,13 @@ def find_pairs(thebot):
 
             # Did we get enough pairs already?
             fixednumpairs = int(config.get("settings", "numberofpairs"))
+            if fixednumpairs:
+                if len(newpairslist) == fixednumpairs:
+                    break
+            else:
+                if len(newpairslist) == int(thebot["max_active_deals"]):
+                    break
 
-            if fixednumpairs and len(newpairslist) == fixednumpairs:
-                break
-            if len(newpairslist) == int(thebot["max_active_deals"]):
-                break
         except KeyError as err:
             logger.error(
                 "Something went wrong while parsing LunarCrush data. KeyError for field %s"
diff --git a/galaxyscore.py b/galaxyscore.py
index a7ed140..4b7fcad 100755
--- a/galaxyscore.py
+++ b/galaxyscore.py
@@ -445,11 +445,13 @@ def find_pairs(thebot):
 
             # Did we get enough pairs already?
             fixednumpairs = int(config.get("settings", "numberofpairs"))
+            if fixednumpairs:
+                if len(newpairslist) == fixednumpairs:
+                    break
+            else:
+                if len(newpairslist) == int(thebot["max_active_deals"]):
+                    break
 
-            if fixednumpairs and len(newpairslist) == fixednumpairs:
-                break
-            if len(newpairslist) == int(thebot["max_active_deals"]):
-                break
         except KeyError as err:
             logger.error(
                 "Something went wrong while parsing LunarCrush data. KeyError for field %s"