diff --git a/trunk/src/or/routerlist.c b/trunk/src/or/routerlist.c
index bb29e3917a..10df528f4a 100644
--- a/trunk/src/or/routerlist.c
+++ b/trunk/src/or/routerlist.c
@@ -436,7 +436,7 @@ routerlist_sl_choose_by_bandwidth(smartlist_t *sl)
 //    log_fn(LOG_INFO,"Recording bw %d for node %s.", this_bw, router->nickname);
   }
   if(!total_bw)
-    return NULL;
+    return smartlist_choose(sl);
   rand_bw = crypto_pseudo_rand_int(total_bw);
 //  log_fn(LOG_INFO,"Total bw %d. Randomly chose %d.", total_bw, rand_bw);
   tmp = 0;