diff --git a/src/config.rs b/src/config.rs
index f1a9aef0f..305e8765c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -945,15 +945,10 @@ impl Context {
     /// Returns `false` if no addresses are configured.
     pub(crate) async fn is_self_addr(&self, addr: &str) -> Result<bool> {
         Ok(self
-            .get_config(Config::ConfiguredAddr)
+            .get_all_self_addrs()
             .await?
             .iter()
-            .any(|a| addr_cmp(addr, a))
-            || self
-                .get_secondary_self_addrs()
-                .await?
-                .iter()
-                .any(|a| addr_cmp(addr, a)))
+            .any(|a| addr_cmp(addr, a)))
     }
 
     /// Sets `primary_new` as the new primary self address and saves the old
@@ -1000,14 +995,6 @@ impl Context {
             .await
     }
 
-    /// Returns all secondary self addresses.
-    pub(crate) async fn get_secondary_self_addrs(&self) -> Result<Vec<String>> {
-        self.sql.query_map_vec("SELECT addr FROM transports WHERE addr NOT IN (SELECT value FROM config WHERE keyname='configured_addr')", (), |row| {
-            let addr: String = row.get(0)?;
-            Ok(addr)
-        }).await
-    }
-
     /// Returns all published secondary self addresses.
     /// See `[Context::set_transport_unpublished]`
     pub(crate) async fn get_published_secondary_self_addrs(&self) -> Result<Vec<String>> {
diff --git a/src/context.rs b/src/context.rs
index b89460fba..801dfbce8 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -843,7 +843,7 @@ impl Context {
 
     /// Returns information about the context as key-value pairs.
     pub async fn get_info(&self) -> Result<BTreeMap<&'static str, String>> {
-        let secondary_addrs = self.get_secondary_self_addrs().await?.join(", ");
+        let all_self_addrs = self.get_all_self_addrs().await?.join(", ");
         let all_transports: Vec<String> = ConfiguredLoginParam::load_all(self)
             .await?
             .into_iter()
@@ -945,7 +945,7 @@ impl Context {
             }
         }
 
-        res.insert("secondary_addrs", secondary_addrs);
+        res.insert("all_self_addrs", all_self_addrs);
         res.insert(
             "who_can_call_me",
             self.get_config_int(Config::WhoCanCallMe).await?.to_string(),
diff --git a/src/transport/transport_tests.rs b/src/transport/transport_tests.rs
index e0949044b..63773ca25 100644
--- a/src/transport/transport_tests.rs
+++ b/src/transport/transport_tests.rs
@@ -422,13 +422,6 @@ async fn check_addrs(
             a.get_published_self_addrs().await.unwrap(),
             published_self_addrs.clone(),
         );
-        assert_eq(
-            a.get_secondary_self_addrs().await.unwrap(),
-            concat(&[
-                addresses.secondary_published,
-                addresses.secondary_unpublished,
-            ]),
-        );
         assert_eq(
             a.get_published_secondary_self_addrs().await.unwrap(),
             concat(&[addresses.secondary_published]),