diff --git src/wp-admin/js/customize-controls.js src/wp-admin/js/customize-controls.js
index 7fb87bc88e..115f0a15b9 100644
--- src/wp-admin/js/customize-controls.js
+++ src/wp-admin/js/customize-controls.js
@@ -8034,11 +8034,15 @@
 			};
 
 			// Show changeset UUID in URL when in branching mode and there is a saved changeset.
-			if ( api.settings.changeset.branching ) {
-				changesetStatus.bind( function( newStatus ) {
-					populateChangesetUuidParam( '' !== newStatus && 'publish' !== newStatus && 'trash' !== newStatus );
-				} );
-			}
+			changesetStatus.bind( function( newStatus ) {
+				var shouldInclude = '' !== newStatus && 'publish' !== newStatus && 'trash' !== newStatus;
+				if ( api.settings.changeset.branching ) {
+					populateChangesetUuidParam( shouldInclude );
+				} else if ( ! shouldInclude ) {
+					populateChangesetUuidParam( false ); // Only remove UUID if not in branching mode.
+				}
+
+			} );
 		}( api.state ) );
 
 		/**