diff --git a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
index 5131f03b4..ab9da6a0b 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/Renderer.js
@@ -214,7 +214,9 @@ class Renderer {
 				}
 			);
 
-		this.renderedSources.add( wrapper + ( fundingSource ?? '' ) );
+		this.renderedSources.add(
+			wrapper + ( fundingSource ? fundingSource : '' )
+		);
 
 		if ( window.paypal?.Buttons ) {
 			widgetBuilder.registerButtons(
diff --git a/modules/ppcp-button/resources/js/modules/Renderer/WidgetBuilder.js b/modules/ppcp-button/resources/js/modules/Renderer/WidgetBuilder.js
index baa031ca6..13d915df2 100644
--- a/modules/ppcp-button/resources/js/modules/Renderer/WidgetBuilder.js
+++ b/modules/ppcp-button/resources/js/modules/Renderer/WidgetBuilder.js
@@ -40,8 +40,9 @@ class WidgetBuilder {
 
 	renderButtons( wrapper ) {
 		wrapper = this.sanitizeWrapper( wrapper );
+		const entryKey = this.toKey( wrapper );
 
-		if ( ! this.buttons.has( this.toKey( wrapper ) ) ) {
+		if ( ! this.buttons.has( entryKey ) ) {
 			return;
 		}
 
@@ -49,11 +50,11 @@ class WidgetBuilder {
 			return;
 		}
 
-		const entry = this.buttons.get( this.toKey( wrapper ) );
+		const entry = this.buttons.get( entryKey );
 		const btn = this.paypal.Buttons( entry.options );
 
 		if ( ! btn.isEligible() ) {
-			this.buttons.delete( this.toKey( wrapper ) );
+			this.buttons.delete( entryKey );
 			return;
 		}
 
@@ -67,7 +68,7 @@ class WidgetBuilder {
 	}
 
 	renderAllButtons() {
-		for ( const [ wrapper, entry ] of this.buttons ) {
+		for ( const [ wrapper ] of this.buttons ) {
 			this.renderButtons( wrapper );
 		}
 	}