diff --git a/libi2pd_client/AddressBook.cpp b/libi2pd_client/AddressBook.cpp
index 8b8e781d..7af1272d 100644
--- a/libi2pd_client/AddressBook.cpp
+++ b/libi2pd_client/AddressBook.cpp
@@ -198,13 +198,18 @@ namespace client
 
 		for (const auto& it: addresses)
 		{
-			f << it.first << ",";
-			if (it.second->IsIdentHash ())
-				f << it.second->identHash.ToBase32 ();
+			if (it.second->IsValid ())
+			{	
+				f << it.first << ",";
+				if (it.second->IsIdentHash ())
+					f << it.second->identHash.ToBase32 ();
+				else
+					f << it.second->blindedPublicKey->ToB33 ();
+				f << std::endl;
+				num++;
+			}	
 			else
-				f << it.second->blindedPublicKey->ToB33 ();
-			f << std::endl;
-			num++;
+				LogPrint (eLogWarning, "Addressbook: invalid address ", it.first);
 		}
 		LogPrint (eLogInfo, "Addressbook: ", num, " addresses saved");
 		return num;