diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index ee0c11f8b06a..d44ea51b646f 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -257,7 +257,7 @@ class AccountGatewayController extends BaseController
                     if (! $value && in_array($field, ['testMode', 'developerMode', 'sandbox'])) {
                         // do nothing
                     } elseif ($gatewayId == GATEWAY_CUSTOM) {
-                        $config->$field = strip_tags($value);
+                        $config->$field = Utils::isNinjaProd() ? strip_tags($value) : $value;
                     } else {
                         $config->$field = $value;
                     }
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index 607471685b2f..252ea9185740 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -329,7 +329,11 @@
               </div>
 
              <div class="panel-body">
-                  {!! nl2br(e($customGatewayText)) !!}
+				  @if (Utils::isNinjaProd())
+				    {!! nl2br(e($customGatewayText)) !!}
+				  @else
+				    {!! $customGatewayText !!}
+				  @endif
               </div>
 
               <div class="modal-footer">