diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index 9320a554e510c..47ec854a965fc 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -106,7 +106,7 @@ public static function get_font_collection( $id ) {
 	 * @return string Path of the upload directory for fonts.
 	 */
 	public static function get_fonts_dir() {
-		return path_join( WP_CONTENT_DIR, 'fonts' );
+		return ( defined( 'WP_FONT_DIR' ) && ! empty( WP_FONT_DIR ) ) ? WP_FONT_DIR : path_join( WP_CONTENT_DIR, 'fonts' );
 	}
 
 	/**
@@ -119,19 +119,14 @@ public static function get_fonts_dir() {
 	 *
 	 *     @type string $path    Path to the directory.
 	 *     @type string $url     URL for the directory.
-	 *     @type string $subdir  Sub-directory of the directory.
-	 *     @type string $basedir Base directory.
-	 *     @type string $baseurl Base URL.
 	 * }
 	 * @return array Modified upload directory.
 	 */
 	public static function set_upload_dir( $defaults ) {
-		$defaults['basedir'] = WP_CONTENT_DIR;
-		$defaults['baseurl'] = content_url();
-		$defaults['subdir']  = '/fonts';
-		$defaults['path']    = self::get_fonts_dir();
-		$defaults['url']     = $defaults['baseurl'] . '/fonts';
+		$font_url = ( defined( 'WP_FONT_URL' ) && ! empty( WP_FONT_URL ) ) ? set_url_scheme( WP_FONT_URL ) : content_url( 'fonts' );
 
+		$defaults['path'] = self::get_fonts_dir();
+		$defaults['url']  = untrailingslashit( $font_url );
 		return $defaults;
 	}
 
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
index daa4c84aad900..ea99a66af1f19 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
@@ -14,18 +14,12 @@ class Tests_Fonts_WpFontLibrary_SetUploadDir extends WP_UnitTestCase {
 
 	public function test_should_set_fonts_upload_dir() {
 		$defaults = array(
-			'subdir'  => '/abc',
-			'basedir' => '/any/path',
-			'baseurl' => 'http://example.com/an/arbitrary/url',
-			'path'    => '/any/path/abc',
-			'url'     => 'http://example.com/an/arbitrary/url/abc',
+			'path' => '/any/path/abc',
+			'url'  => 'http://example.com/an/arbitrary/url/abc',
 		);
 		$expected = array(
-			'subdir'  => '/fonts',
-			'basedir' => WP_CONTENT_DIR,
-			'baseurl' => content_url(),
-			'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
-			'url'     => content_url() . '/fonts',
+			'path' => path_join( WP_CONTENT_DIR, 'fonts' ),
+			'url'  => content_url( 'fonts' ),
 		);
 		$this->assertSame( $expected, WP_Font_Library::set_upload_dir( $defaults ) );
 	}