diff --git a/relation.module b/relation.module
index b131bdc..3cb13bd 100644
--- a/relation.module
+++ b/relation.module
@@ -782,9 +782,7 @@ function relation_uri($relation) {
  *   The query object itself.
  */
 function relation_query($entity_type = NULL, $entity_id = NULL, $r_index = NULL) {
-  $query = new RelationQuery($entity_type, $entity_id, $r_index);
-  $query->range(0, 50);
-  return $query;
+  return new RelationQuery($entity_type, $entity_id, $r_index);
 }
 
 /**
@@ -852,7 +850,7 @@ function relation_get_related_entity($entity_type, $entity_id, $relation_type =
     $items[$cache_key] = $entities;
   }
   else {
-    $query = relation_query($entity_type, $entity_id, $r_index);
+    $query = relation_query($entity_type, $entity_id, $r_index)->range(0, 1);
     if ($relation_type) {
       $query->entityCondition('bundle', $relation_type);
     }
diff --git a/relation.rules.inc b/relation.rules.inc
index 9789057..940ad41 100644
--- a/relation.rules.inc
+++ b/relation.rules.inc
@@ -191,7 +191,11 @@ function relation_rules_get_related_entities($entity, array $options, $name, $ty
   $source_entity = entity_metadata_wrapper($type, $entity);
   $source_entity_type = $source_entity->type();
   $source_entity_id = $source_entity->getIdentifier();
-  $rids = array_keys(relation_query($source_entity_type, $source_entity_id)->entityCondition('bundle', $info['relation_type'])->execute());
+  $results = relation_query($source_entity_type, $source_entity_id)
+    ->entityCondition('bundle', $info['relation_type'])
+    ->range(0, 50)
+    ->execute();
+  $rids = array_keys($results);
   $entities_ids = array();
   if (!$rids) {
     return $entities_ids;
diff --git a/relation_dummy_field/relation_dummy_field.module b/relation_dummy_field/relation_dummy_field.module
index 8fcc44a..a857299 100644
--- a/relation_dummy_field/relation_dummy_field.module
+++ b/relation_dummy_field/relation_dummy_field.module
@@ -196,7 +196,7 @@ function relation_dummy_field_field_formatter_view($entity_type, $entity, $field
 function relation_dummy_field_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
   foreach ($entities as $id => $entity) {
     $relation_types = $instances[$id]['settings']['relation_type'];
-    $query = relation_query($entity_type, $id);
+    $query = relation_query($entity_type, $id)->range(0, 50);
     if ($relation_types) {
       $query->entityCondition('bundle', $relation_types, 'IN');
     }