diff --git a/src/solver.c b/src/solver.c
index bdce9a9d7..363d88734 100644
--- a/src/solver.c
+++ b/src/solver.c
@@ -4297,7 +4297,7 @@ solver_solve(Solver *solv, Queue *job)
   else
     solv->strictrepopriorules = solv->strictrepopriorules_end = solv->nrules;
 
-  if (1)
+  if (pool->disttype != DISTTYPE_CONDA)
     solver_addchoicerules(solv);
   else
     solv->choicerules = solv->choicerules_end = solv->nrules;