diff --git a/fdbclient/MonitorLeader.actor.cpp b/fdbclient/MonitorLeader.actor.cpp
index 524315cb2f..f72913f7ee 100644
--- a/fdbclient/MonitorLeader.actor.cpp
+++ b/fdbclient/MonitorLeader.actor.cpp
@@ -800,8 +800,6 @@ ACTOR Future<Void> monitorLeaderAndGetClientInfo(Key clusterKey,
 		if (leader.present()) {
 			if (leader.get().first.forward) {
 				ClientDBInfo outInfo;
-				// TODO: change?
-				outInfo.isEncryptionEnabled = false;
 				outInfo.id = deterministicRandom()->randomUniqueID();
 				outInfo.forward = leader.get().first.serializedInfo;
 				clientData->clientInfo->set(CachedSerialization<ClientDBInfo>(outInfo));
diff --git a/fdbclient/include/fdbclient/Tenant.h b/fdbclient/include/fdbclient/Tenant.h
index 22b642a828..068b755a38 100644
--- a/fdbclient/include/fdbclient/Tenant.h
+++ b/fdbclient/include/fdbclient/Tenant.h
@@ -47,7 +47,7 @@ struct TenantMapEntry {
 	Key prefix;
 	TenantState tenantState = TenantState::READY;
 	Optional<TenantGroupName> tenantGroup;
-	bool encrypted;
+	bool encrypted = false;
 
 	constexpr static int PREFIX_SIZE = sizeof(id);