diff --git a/src/cell.c b/src/cell.c
index 9fd32ed8c6402d51358bcdc888aefaad16abe7c2..10221d48d401c5db179aa2a58457ce47f1ac0050 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -3627,7 +3627,8 @@ void cell_set_super(struct cell *c, struct cell *super, const int with_hydro,
 void cell_set_super_hydro(struct cell *c, struct cell *super_hydro) {
 
   /* Are we in a cell with some kind of self/pair task ? */
-  if (super_hydro == NULL && c->hydro.density != NULL) super_hydro = c;
+  if (super_hydro == NULL && (c->hydro.density != NULL || c->stars.count > 0))
+    super_hydro = c;
 
   /* Set the super-cell */
   c->hydro.super = super_hydro;