diff --git a/wp-includes/query.php b/wp-includes/query.php
index 881b9959c6..96148ba20e 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -4956,6 +4956,10 @@ class WP_Query {
 function wp_old_slug_redirect() {
 	global $wp_query, $wp_rewrite;
 
+	if ( get_queried_object() ) {
+		return;
+	}
+
 	if ( '' !== $wp_query->query_vars['name'] ) :
 		global $wpdb;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2ef065e69e..4a56070f85 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36127';
+$wp_version = '4.5-alpha-36128';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.