diff --git a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
index 89a1bef2..e877a71f 100644
--- a/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/persistence/Mapper.swift
@@ -105,7 +105,7 @@ class Mapper {
         
         mapped.haveAllTransactionsBeenRetrieved = account.haveAllTransactionsBeenRetrieved
         mapped.isAccountTypeSupportedByApplication = account.isAccountTypeSupportedByApplication
-        mapped.countDaysForWhichTransactionsAreKept = map(account.countDaysForWhichTransactionsAreKept)!
+        mapped.countDaysForWhichTransactionsAreKept = map(account.countDaysForWhichTransactionsAreKept ?? 0)!
         
         mapped.userSetDisplayName = account.userSetDisplayName
         mapped.displayIndex = account.displayIndex