diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e26a094..4026bd20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * *BREAKING* Upgrade React to v18. Refs UIORGS-377.
 * Upgrade `Node.js` to `18` version in GitHub Actions. Refs UIORGS-378.
 * *BREAKING* bump `react-intl` to `v6.4.4`. Refs UIORGS-386.
+* Add a message indicating future functionality for EDI naming convention. Refs UIORGS-382.
 
 ## [4.0.0](https://github.com/folio-org/ui-organizations/tree/v4.0.0) (2023-02-22)
 [Full Changelog](https://github.com/folio-org/ui-organizations/compare/v3.3.1...v4.0.0)
diff --git a/src/OrganizationIntegration/OrganizationIntegrationForm/EdiForm/EdiForm.js b/src/OrganizationIntegration/OrganizationIntegrationForm/EdiForm/EdiForm.js
index 3f98e922..89027b65 100644
--- a/src/OrganizationIntegration/OrganizationIntegrationForm/EdiForm/EdiForm.js
+++ b/src/OrganizationIntegration/OrganizationIntegrationForm/EdiForm/EdiForm.js
@@ -157,10 +157,15 @@ export const EdiForm = ({
               <>
                 <FormattedMessage id="ui-organizations.integration.edi.ediNamingConvention" />
                 <InfoPopover content={(
-                  <FormattedMessage
-                    id="ui-organizations.integration.edi.ediNamingConvention.info"
-                    values={{ tokens: Object.values(EDI_NAMING_TOKENS).join(', ') }}
-                  />)}
+                  <>
+                    <FormattedMessage id="ui-organizations.comingSoon" />
+                    <FormattedMessage
+                      id="ui-organizations.integration.edi.ediNamingConvention.info"
+                      values={{ tokens: <p>{Object.values(EDI_NAMING_TOKENS).join(', ')}</p> }}
+                      tagName="p"
+                    />
+                  </>
+                  )}
                 />
               </>
             )}
diff --git a/translations/ui-organizations/en.json b/translations/ui-organizations/en.json
index 028d4183..7b83dd21 100644
--- a/translations/ui-organizations/en.json
+++ b/translations/ui-organizations/en.json
@@ -10,6 +10,8 @@
   "notes.entity": "Organization",
   "notes.entityPlural": "Organizations",
 
+  "comingSoon": "Coming in a future release.",
+
   "data.contactTypes.address": "Address",
   "data.contactTypes.addressLine1": "Address 1",
   "data.contactTypes.addressLine2": "Address 2",