diff --git a/config/rapidez/checkout-theme.php b/config/rapidez/checkout-theme.php
index 42321379..4adf3098 100644
--- a/config/rapidez/checkout-theme.php
+++ b/config/rapidez/checkout-theme.php
@@ -24,12 +24,12 @@
     ],
     'checkout' => [
         'success' => [
-            // Show the account registration on the success page?
-            'register' => false
+            // Show the account registration on the success page
+            'register' => false,
         ],
     ],
     'register' => [
-        // Make the user create an address during registration.
+        // Make the user create an address during registration
         'create-address' => false,
     ],
 ];
diff --git a/resources/views/account/edit.blade.php b/resources/views/account/edit.blade.php
index bb0f358d..97453fab 100644
--- a/resources/views/account/edit.blade.php
+++ b/resources/views/account/edit.blade.php
@@ -11,9 +11,11 @@
                 <x-rapidez-ct::card.inactive>
                     @include('rapidez-ct::account.partials.sections.edit.addresses')
                 </x-rapidez-ct::card.inactive>
-                <x-rapidez-ct::card.inactive>
-                    @include('rapidez-ct::account.partials.sections.edit.newsletter')
-                </x-rapidez-ct::card.inactive>
+                @if (Rapidez::config('newsletter/general/active', 1))
+                    <x-rapidez-ct::card.inactive>
+                        @include('rapidez-ct::account.partials.sections.edit.newsletter')
+                    </x-rapidez-ct::card.inactive>
+                @endif
                 <x-rapidez-ct::card.inactive>
                     @include('rapidez-ct::account.partials.sections.edit.email')
                 </x-rapidez-ct::card.inactive>
diff --git a/resources/views/account/partials/register-account.blade.php b/resources/views/account/partials/register-account.blade.php
index 01022286..4e057d2c 100644
--- a/resources/views/account/partials/register-account.blade.php
+++ b/resources/views/account/partials/register-account.blade.php
@@ -97,9 +97,11 @@ class="grid gap-5 md:grid-cols-2"
                 </x-rapidez-ct::card.inactive>
             @endif
 
-            <x-rapidez-ct::card.inactive>
-                <x-rapidez-ct::newsletter v-model="variables.is_subscribed"/>
-            </x-rapidez-ct::card.inactive>
+            @if (Rapidez::config('newsletter/general/active', 1))
+                <x-rapidez-ct::card.inactive>
+                    <x-rapidez-ct::newsletter v-model="variables.is_subscribed"/>
+                </x-rapidez-ct::card.inactive>
+            @endif
         </x-rapidez-ct::sections>
     </graphql-mutation>
 </graphql-mutation>
diff --git a/resources/views/checkout/steps/credentials.blade.php b/resources/views/checkout/steps/credentials.blade.php
index b0bc25b5..695a528e 100644
--- a/resources/views/checkout/steps/credentials.blade.php
+++ b/resources/views/checkout/steps/credentials.blade.php
@@ -7,9 +7,11 @@
     <x-rapidez-ct::card.inactive>
         @include('rapidez-ct::checkout.partials.sections.address')
     </x-rapidez-ct::card.inactive>
-    <x-rapidez-ct::card.inactive>
-        @include('rapidez-ct::checkout.partials.sections.newsletter')
-    </x-rapidez-ct::card.inactive>
+    @if (Rapidez::config('newsletter/general/active', 1))
+        <x-rapidez-ct::card.inactive>
+            @include('rapidez-ct::checkout.partials.sections.newsletter')
+        </x-rapidez-ct::card.inactive>
+    @endif
     <x-rapidez-ct::card.inactive>
         @include('rapidez-ct::checkout.partials.sections.shipping')
     </x-rapidez-ct::card.inactive>
diff --git a/resources/views/checkout/steps/success.blade.php b/resources/views/checkout/steps/success.blade.php
index 6e095349..f1823678 100644
--- a/resources/views/checkout/steps/success.blade.php
+++ b/resources/views/checkout/steps/success.blade.php
@@ -19,9 +19,11 @@
 
                 @include('rapidez-ct::checkout.partials.sections.success.products')
 
-                <x-rapidez-ct::card.inactive>
-                    @include('rapidez-ct::checkout.partials.sections.success.newsletter')
-                </x-rapidez-ct::card.inactive>  
+                @if (Rapidez::config('newsletter/general/active', 1))
+                    <x-rapidez-ct::card.inactive>
+                        @include('rapidez-ct::checkout.partials.sections.success.newsletter')
+                    </x-rapidez-ct::card.inactive>
+                @endif
                 <x-rapidez-ct::card.inactive>
                     @if (config('rapidez.checkout-theme.checkout.success.register'))
                         @include('rapidez-ct::checkout.partials.sections.success.create-account')