diff --git a/composer.json b/composer.json
index 1fcfbf720..eaa90bc56 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft-freeform",
   "description": "The most reliable form builder that's ready for wherever your project takes you.",
-  "version": "5.8.6",
+  "version": "5.8.6.1",
   "type": "craft-plugin",
   "authors": [
     {
diff --git a/packages/plugin/src/Integrations/Captchas/ReCaptcha/ReCaptcha.php b/packages/plugin/src/Integrations/Captchas/ReCaptcha/ReCaptcha.php
index 563bda962..6619a76ed 100644
--- a/packages/plugin/src/Integrations/Captchas/ReCaptcha/ReCaptcha.php
+++ b/packages/plugin/src/Integrations/Captchas/ReCaptcha/ReCaptcha.php
@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Client;
 use Solspace\Freeform\Attributes\Integration\Type;
-use Solspace\Freeform\Attributes\Property\Edition;
 use Solspace\Freeform\Attributes\Property\Flag;
 use Solspace\Freeform\Attributes\Property\Input;
 use Solspace\Freeform\Attributes\Property\Middleware;
@@ -35,8 +34,6 @@ class ReCaptcha extends BaseIntegration implements CaptchaIntegrationInterface
     public const BEHAVIOR_DISPLAY_ERROR = 'display-error';
     public const BEHAVIOR_SEND_TO_SPAM = 'send-to-spam';
 
-    #[Edition(Edition::PRO)]
-    #[Edition(Edition::LITE)]
     #[Flag(self::FLAG_AS_HIDDEN_IN_INSTANCE)]
     #[Input\Select(
         label: 'Captcha Type',
diff --git a/packages/plugin/src/Integrations/Captchas/Turnstile/Turnstile.php b/packages/plugin/src/Integrations/Captchas/Turnstile/Turnstile.php
index 871e947c9..255fa97f1 100644
--- a/packages/plugin/src/Integrations/Captchas/Turnstile/Turnstile.php
+++ b/packages/plugin/src/Integrations/Captchas/Turnstile/Turnstile.php
@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Client;
 use Solspace\Freeform\Attributes\Integration\Type;
-use Solspace\Freeform\Attributes\Property\Edition;
 use Solspace\Freeform\Attributes\Property\Flag;
 use Solspace\Freeform\Attributes\Property\Input;
 use Solspace\Freeform\Attributes\Property\Middleware;
@@ -17,8 +16,6 @@
 use Solspace\Freeform\Library\Integrations\EnabledByDefault\EnabledByDefaultTrait;
 use Solspace\Freeform\Library\Integrations\Types\Captchas\CaptchaIntegrationInterface;
 
-#[Edition(Edition::PRO)]
-#[Edition(Edition::LITE)]
 #[Type(
     name: 'Turnstile',
     type: Type::TYPE_CAPTCHAS,
diff --git a/packages/plugin/src/Integrations/Captchas/hCaptcha/hCaptcha.php b/packages/plugin/src/Integrations/Captchas/hCaptcha/hCaptcha.php
index 7da82fd71..a81c2a89b 100644
--- a/packages/plugin/src/Integrations/Captchas/hCaptcha/hCaptcha.php
+++ b/packages/plugin/src/Integrations/Captchas/hCaptcha/hCaptcha.php
@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Client;
 use Solspace\Freeform\Attributes\Integration\Type;
-use Solspace\Freeform\Attributes\Property\Edition;
 use Solspace\Freeform\Attributes\Property\Flag;
 use Solspace\Freeform\Attributes\Property\Input;
 use Solspace\Freeform\Attributes\Property\Validators\Required;
@@ -17,8 +16,6 @@
 use Solspace\Freeform\Library\Integrations\EnabledByDefault\EnabledByDefaultTrait;
 use Solspace\Freeform\Library\Integrations\Types\Captchas\CaptchaIntegrationInterface;
 
-#[Edition(Edition::PRO)]
-#[Edition(Edition::LITE)]
 #[Type(
     name: 'hCaptcha',
     type: Type::TYPE_CAPTCHAS,
diff --git a/packages/plugin/src/controllers/SubmissionsController.php b/packages/plugin/src/controllers/SubmissionsController.php
index b833175ef..03f105059 100644
--- a/packages/plugin/src/controllers/SubmissionsController.php
+++ b/packages/plugin/src/controllers/SubmissionsController.php
@@ -55,10 +55,8 @@ public function actionIndex(?string $formHandle = null): Response
         $registerAssetsEvent = new RegisterEvent(\Craft::$app->view);
         $this->trigger(self::EVENT_REGISTER_INDEX_ASSETS, $registerAssetsEvent);
 
-        if (Freeform::getInstance()->isPro()) {
-            if (PermissionHelper::checkPermission(Freeform::PERMISSION_ACCESS_QUICK_EXPORT)) {
-                \Craft::$app->view->registerAssetBundle(ExportButtonBundle::class);
-            }
+        if (PermissionHelper::checkPermission(Freeform::PERMISSION_ACCESS_QUICK_EXPORT)) {
+            \Craft::$app->view->registerAssetBundle(ExportButtonBundle::class);
         }
 
         $forms = $this->getFormsService()->getAllForms();
diff --git a/packages/plugin/src/templates/export/profiles/index.twig b/packages/plugin/src/templates/export/profiles/index.twig
index 48bffc287..cddc94131 100644
--- a/packages/plugin/src/templates/export/profiles/index.twig
+++ b/packages/plugin/src/templates/export/profiles/index.twig
@@ -11,7 +11,7 @@
 
 {% block actionButton %}
 
-    {% if craft.freeform.pro and currentUser.can("freeform-pro-exportProfilesManage") %}
+    {% if freeform.edition.atLeast('lite') and currentUser.can("freeform-pro-exportProfilesManage") %}
 
         <div class="buttons">
             {% if forms|length %}
@@ -108,10 +108,10 @@
         </table>
     {% else %}
         <div class="zilch">
-            {% if freeform.pro %}
+            {% if freeform.edition.atLeast('lite') %}
                 {{ "No export profiles exist yet."|t("freeform") }}
             {% else %}
-                {{ "Upgrade to the Pro edition of Freeform to get access to Export Profiles."|t('freeform') }}
+                {{ "Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles."|t('freeform') }}
             {% endif %}
         </div>
     {% endif %}
diff --git a/packages/plugin/src/translations/de/freeform.php b/packages/plugin/src/translations/de/freeform.php
index 25b93ba3d..5cf319f72 100644
--- a/packages/plugin/src/translations/de/freeform.php
+++ b/packages/plugin/src/translations/de/freeform.php
@@ -705,6 +705,7 @@
     'Profiles' => 'Profile',
     'Export Profiles' => 'Export-Profile',
     'No export profiles found' => 'Keine Export-Profile gefunden',
+    'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.' => 'Führen Sie ein Upgrade auf die Lite- oder Pro-Edition von Freeform durch, um Zugriff auf Exportprofile zu erhalten.',
     'Export' => 'Exportieren',
     'New Export Profile' => 'Neues Export-Profil',
     'Create a new Export Profile' => 'Ein neues Export-Profil erstellen',
diff --git a/packages/plugin/src/translations/en/freeform.php b/packages/plugin/src/translations/en/freeform.php
index 9b3c92db4..3aaeb2842 100644
--- a/packages/plugin/src/translations/en/freeform.php
+++ b/packages/plugin/src/translations/en/freeform.php
@@ -705,6 +705,7 @@
     'Profiles' => 'Profiles',
     'Export Profiles' => 'Export Profiles',
     'No export profiles found' => 'No export profiles found',
+    'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.' => 'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.',
     'Export' => 'Export',
     'New Export Profile' => 'New Export Profile',
     'Create a new Export Profile' => 'Create a new Export Profile',
diff --git a/packages/plugin/src/translations/fr/freeform.php b/packages/plugin/src/translations/fr/freeform.php
index 05e0b4563..acb16f0a3 100644
--- a/packages/plugin/src/translations/fr/freeform.php
+++ b/packages/plugin/src/translations/fr/freeform.php
@@ -705,6 +705,7 @@
     'Profiles' => 'Profils',
     'Export Profiles' => 'Profils d’exportation',
     'No export profiles found' => 'Aucun profil d’exportation trouvé',
+    'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.' => 'Passez à l’édition Lite ou Pro de Freeform pour accéder aux profils d’exportation.',
     'Export' => 'Exporter',
     'New Export Profile' => 'Nouveau profil d’exportation',
     'Create a new Export Profile' => 'Créer un nouveau profil d’exportation',
diff --git a/packages/plugin/src/translations/it/freeform.php b/packages/plugin/src/translations/it/freeform.php
index 4e2466f88..8ba81712a 100644
--- a/packages/plugin/src/translations/it/freeform.php
+++ b/packages/plugin/src/translations/it/freeform.php
@@ -705,6 +705,7 @@
     'Profiles' => 'Profili',
     'Export Profiles' => 'Esporta Profili',
     'No export profiles found' => 'Nessun profilo di esportazione trovato',
+    'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.' => 'Esegui l’upgrade all’edizione Lite o Pro di Freeform per ottenere l’accesso ai profili di esportazione.',
     'Export' => 'Esporta',
     'New Export Profile' => 'Nuovo Profilo di Esportazione',
     'Create a new Export Profile' => 'Crea un nuovo Profilo di Esportazione',
diff --git a/packages/plugin/src/translations/nl/freeform.php b/packages/plugin/src/translations/nl/freeform.php
index 53284550c..1c5ebb49d 100644
--- a/packages/plugin/src/translations/nl/freeform.php
+++ b/packages/plugin/src/translations/nl/freeform.php
@@ -705,6 +705,7 @@
     'Profiles' => 'Profielen',
     'Export Profiles' => 'Profielen exporteren',
     'No export profiles found' => 'Geen exportprofielen gevonden',
+    'Upgrade to the Lite or Pro edition of Freeform to get access to Export Profiles.' => 'Upgrade naar de Lite- of Pro-editie van Freeform om toegang te krijgen tot exportprofielen.',
     'Export' => 'Exporteren',
     'New Export Profile' => 'Nieuw exportprofiel',
     'Create a new Export Profile' => 'Maak een nieuw exportprofiel',