diff --git a/src/engine_maketasks.c b/src/engine_maketasks.c
index 72d3e55f6cb3169205b4f739948efdecd74fd58f..863a13459e4e73445478eb7b3c3181235fc27b8c 100644
--- a/src/engine_maketasks.c
+++ b/src/engine_maketasks.c
@@ -222,11 +222,19 @@ void engine_addtasks_send_stars(struct engine *e, struct cell *ci,
   const int nodeID = cj->nodeID;
 
   /* Check if any of the density tasks are for the target node. */
-  for (l = ci->stars.density; l != NULL; l = l->next)
+  for (l = ci->hydro.density; l != NULL; l = l->next)
     if (l->t->ci->nodeID == nodeID ||
         (l->t->cj != NULL && l->t->cj->nodeID == nodeID))
       break;
 
+  /* Check for stars now */
+  if (l == NULL) {  
+    for (l = ci->stars.density; l != NULL; l = l->next)
+      if (l->t->ci->nodeID == nodeID ||
+	  (l->t->cj != NULL && l->t->cj->nodeID == nodeID))
+	break;
+  }
+
   /* If so, attach send tasks. */
   if (l != NULL) {
     /* Get the task if created in hydro part */