diff --git a/Civi/Eck/API/Entity.php b/Civi/Eck/API/Entity.php
index 79c2400..29a977e 100644
--- a/Civi/Eck/API/Entity.php
+++ b/Civi/Eck/API/Entity.php
@@ -15,6 +15,7 @@
 
 namespace Civi\Eck\API;
 
+use Civi\Api4\CustomGroup;
 use Civi\Api4\EckEntity;
 use Civi\Core\Service\AutoSubscriber;
 use Civi\Eck\Permissions;
@@ -155,11 +156,28 @@ public static function getEckAfforms($event): void {
             ->addWhere('input_type', 'IS NOT EMPTY')
             // Don't allow subtype to be changed on the form, since this form is specific to subtype
             ->addWhere('name', '!=', 'subtype')
+            // Exclude custom fields, as they are being handled by Afform's automatic custom blocks.
+            ->addWhere('type', '!=', 'Custom')
             ->execute();
+          $customGroups = CustomGroup::get(FALSE)
+            ->addSelect('name', 'title')
+            ->addWhere('extends', '=', $entityType['entity_name'])
+            ->addClause(
+              'OR',
+              ['extends_entity_column_value', '=', $subType['value']],
+              ['extends_entity_column_value', 'IS EMPTY']
+            )
+            ->execute()
+            ->getArrayCopy();
+          array_walk($customGroups, function (&$customGroup) {
+            /** @phpstan-var array{id: int, name: string, title: string} $customGroup */
+            $customGroup['afName'] = \CRM_Utils_String::convertStringToDash($customGroup['name']);
+          });
           $item['layout'] = \CRM_Core_Smarty::singleton()->fetchWith('ang/afformEck.tpl', [
             'entityType' => $entityType,
             'subType' => $subType,
             'fields' => $fields,
+            'customGroups' => $customGroups,
           ]);
         }
         $afforms[$name] = $item;
diff --git a/info.xml b/info.xml
index 1f51ad0..2ef8c5e 100644
--- a/info.xml
+++ b/info.xml
@@ -18,7 +18,7 @@
   <version>1.1-dev</version>
   <develStage>dev</develStage>
   <compatibility>
-    <ver>5.70</ver>
+    <ver>5.75</ver>
   </compatibility>
   <requires></requires>
   <upgrader>CRM_Eck_Upgrader</upgrader>
diff --git a/templates/ang/afformEck.tpl b/templates/ang/afformEck.tpl
index 26a8233..76fe20c 100644
--- a/templates/ang/afformEck.tpl
+++ b/templates/ang/afformEck.tpl
@@ -4,6 +4,12 @@
   {foreach item="field" from=$fields}
     <af-field name="{$field.name}"></af-field>
   {/foreach}
+  {foreach item="customGroup" from=$customGroups}
+    <fieldset>
+      <legend>{$customGroup.title}</legend>
+      <afblock-custom-{$customGroup.afName}></afblock-custom-{$customGroup.afName}>
+    </fieldset>
+  {/foreach}
   </fieldset>
   <button class="af-button btn btn-primary" crm-icon="fa-check" ng-click="afform.submit()">{ts}Submit{/ts}</button>
 </af-form>