diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index f2f53203ea..932ae76ca5 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -234,17 +234,21 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 	}
 
 	$args = array(
-		'domain__in' => $domains,
-		'path__in'   => $paths,
-		'number'     => 1,
+		'number' => 1,
 	);
 
 	if ( count( $domains ) > 1 ) {
+		$args['domain__in']               = $domains;
 		$args['orderby']['domain_length'] = 'DESC';
+	} else {
+		$args['domain'] = array_shift( $domains );
 	}
 
 	if ( count( $paths ) > 1 ) {
+		$args['path__in']               = $paths;
 		$args['orderby']['path_length'] = 'DESC';
+	} else {
+		$args['path'] = array_shift( $paths );
 	}
 
 	$result = get_sites( $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8cfb79c865..5d5db51707 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42697';
+$wp_version = '5.0-alpha-42698';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.