diff --git a/src/or/router.c b/src/or/router.c
index 2be304cb5b..75a10740a9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -402,8 +402,10 @@ int
 check_whether_dirport_reachable(void)
 {
   or_options_t *options = get_options();
+  routerinfo_t *ri = router_get_my_routerinfo();
   return !options->DirPort ||
          options->AssumeReachable ||
+         (ri && !ri->dir_port) ||
          can_reach_dir_port;
 }