2 files changed, 5 insertions, 1 deletions

diff --git a/server/lib/schedulers/auto-follow-index-instances.ts b/server/lib/schedulers/auto-follow-index-instances.ts
index e852c7fc6..a57436a45 100644
--- a/server/lib/schedulers/auto-follow-index-instances.ts
+++ b/server/lib/schedulers/auto-follow-index-instances.ts
@@ -42,6 +42,10 @@ export class AutoFollowIndexInstances extends AbstractScheduler {
       this.lastCheck = new Date()
 
       const { body } = await doRequest<any>({ uri, qs, json: true })
+      if (!body.data || Array.isArray(body.data) === false) {
+        logger.error('Cannot auto follow instances of index %s: bad URL format. Please check the auto follow URL.', indexUrl)
+        return
+      }
 
       const hosts: string[] = body.data.map(o => o.host)
       const chunks = chunk(hosts, 20)
diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts
index 5f48dc0eb..7efccc3e2 100644
--- a/server/tests/api/server/auto-follows.ts
+++ b/server/tests/api/server/auto-follows.ts
@@ -177,7 +177,7 @@ describe('Test auto follows', function () {
         followings: {
           instance: {
             autoFollowIndex: {
-              indexUrl: 'http://localhost:42100',
+              indexUrl: 'http://localhost:42100/api/v1/instances/hosts',
               enabled: true
             }
           }