diff --git a/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs b/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
index 3ae50a620..1d432679e 100644
--- a/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
+++ b/BTCPayServer/Controllers/GreenField/GreenfieldAppsController.cs
@@ -61,9 +61,9 @@ namespace BTCPayServer.Controllers.Greenfield
                 EnableTips = request.EnableTips,
                 Currency = request.Currency ?? defaultCurrency,
                 Template = request.Template,
-                ButtonText = request.FixedAmountPayButtonText,
-                CustomButtonText = request.CustomAmountPayButtonText,
-                CustomTipText = request.TipText,
+                ButtonText = request.FixedAmountPayButtonText ?? PointOfSaleSettings.BUTTON_TEXT_DEF,
+                CustomButtonText = request.CustomAmountPayButtonText ?? PointOfSaleSettings.CUSTOM_BUTTON_TEXT_DEF,
+                CustomTipText = request.TipText ?? PointOfSaleSettings.CUSTOM_TIP_TEXT_DEF,
                 CustomCSSLink = request.CustomCSSLink,
                 NotificationUrl = request.NotificationUrl,
                 RedirectUrl = request.RedirectUrl,