diff --git a/src/plasma/plasma_manager.c b/src/plasma/plasma_manager.c
index f2a7d5c11..c29386966 100644
--- a/src/plasma/plasma_manager.c
+++ b/src/plasma/plasma_manager.c
@@ -401,7 +401,7 @@ void update_object_wait_requests(plasma_manager_state *manager_state,
       /* Make sure that we actually marked an object as available.*/
       CHECK(j != wait_req->num_object_requests);
       /* If this wait request is done, reply to the client. */
-      if (wait_req->num_satisfied == wait_req->num_object_requests) {
+      if (wait_req->num_satisfied == wait_req->num_objects_to_wait_for) {
         return_from_wait(manager_state, wait_req);
       }
     }
diff --git a/src/plasma/test/test.py b/src/plasma/test/test.py
index 62a9ffe3f..4fee0b9af 100644
--- a/src/plasma/test/test.py
+++ b/src/plasma/test/test.py
@@ -590,6 +590,19 @@ class TestPlasmaManager(unittest.TestCase):
     self.assertEqual(set(ready), set(object_ids))
     self.assertEqual(waiting, [])
 
+    # Make sure that wait returns when the requested number of object IDs are
+    # available and does not wait for all object IDs to be available.
+    object_ids = [random_object_id() for _ in range(10)]
+    object_ids_perm = np.random.permutation(object_ids)
+    for i in range(10):
+      if i % 2 == 0:
+        create_object_with_id(self.client1, object_ids_perm[i], 2000, 2000)
+      else:
+        create_object_with_id(self.client2, object_ids_perm[i], 2000, 2000)
+      ready, waiting = self.client1.wait(object_ids, num_returns=(i + 1))
+      self.assertEqual(set(ready), set(object_ids_perm[:(i + 1)]))
+      self.assertEqual(set(waiting), set(object_ids_perm[(i + 1):]))
+
   def test_transfer(self):
     for _ in range(100):
       # Create an object.