diff --git a/config.sample.json b/config.sample.json
index b9d6fc4..e5f7e1d 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -11,6 +11,7 @@
         "verbose": false,
         "disable_pong": false,
         "allowed_from_all": false,
+        "add_buddies_on_init": false,
         "allowed_from_partners": [],
         "send_to": []
     },
diff --git a/lib/custom-ping.js b/lib/custom-ping.js
index 704fce2..acfaf52 100644
--- a/lib/custom-ping.js
+++ b/lib/custom-ping.js
@@ -112,9 +112,32 @@ const pingSender = async () => {
     pingSender();
 };
 
+const addBuddiesOnInit = () => {
+    if (
+        !config.custom_ping || !config.custom_ping.send_to
+        || !Array.isArray(config.custom_ping.send_to)
+        || !config.custom_ping.send_to.length
+    ) {
+        return;
+    }
+
+    logger.verbose(`${MODULE_NAME} 3BBD9A02: Adding custom ping targets as buddies`, {
+        targets: config.custom_ping.send_to,
+    });
+
+    config.custom_ping.send_to.forEach((target) => {
+        bot.subscribe(target);
+    });
+};
+
 const setBot = (botFromCaller) => {
     logger.verbose(`${MODULE_NAME} A063F39F: Bot registered for custom ping`);
     bot = botFromCaller;
+
+    if (config.custom_ping && config.custom_ping.add_buddies_on_init) {
+        addBuddiesOnInit();
+    }
+
     pingSender();
 };
 exports.setBot = setBot;