diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
index 2620ed19a..fed9f0af0 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php
@@ -514,6 +514,8 @@ class Household
 
             if ($iterator->valid()) {
                 $current->setValidTo($iterator->current()->getValidFrom());
+            } else {
+                $current->setValidTo(null);
             }
         }
     }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index 6799f882b..7cf8af3e5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -75,6 +75,7 @@ final class HouseholdTest extends TestCase
 
         $lastAddress = new Address();
         $lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
+        $lastAddress->setValidTo(new DateTime('tomorrow'));
         $household->addAddress($lastAddress);
 
         $this->assertNull($lastAddress->getValidTo());
@@ -82,6 +83,7 @@ final class HouseholdTest extends TestCase
 
         $previousAddress = new Address();
         $previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
+        $previousAddress->setValidTo(new DateTime('now'));
         $household->addAddress($previousAddress);
 
         $addresses = $household->getAddressesOrdered();
@@ -95,6 +97,7 @@ final class HouseholdTest extends TestCase
 
         $futureAddress = new Address();
         $futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
+        $futureAddress->setValidTo(new DateTime('2150-01-01'));
         $household->addAddress($futureAddress);
 
         $addresses = $household->getAddressesOrdered();