diff --git a/src/or/hs_service.c b/src/or/hs_service.c
index 0fba0d7f90..218d49ace3 100644
--- a/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@ -2316,6 +2316,10 @@ upload_descriptor_to_all(const hs_service_t *service,
   hs_get_responsible_hsdirs(&desc->blinded_kp.pubkey, desc->time_period_num,
                             for_next_period, 0, responsible_dirs);
 
+  /** Clear list of previous hsdirs since we are about to upload to a new
+   *  list. Let's keep it up to date. */
+  service_desc_clear_previous_hsdirs(desc);
+
   /* For each responsible HSDir we have, initiate an upload command. */
   SMARTLIST_FOREACH_BEGIN(responsible_dirs, const routerstatus_t *,
                           hsdir_rs) {
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 6bb03f39d6..9980892951 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -613,10 +613,10 @@ test_desc_reupload_logic(void *arg)
   tt_int_op(service_desc_hsdirs_changed(service, desc), OP_EQ, 1);
   tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
 
-  /* Now order another upload and see how we end up with 7 hsdirs */
+  /* Now order another upload and see that we keep having 6 prev hsdirs */
   upload_descriptor_to_all(service, desc, 0);
   /* Check that previous hsdirs were populated */
-  tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 7);
+  tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6);
 
   /* Now restore the HSDir hash ring to its original state by swapping back
      aaron for nora */