diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 6efa5833a2..17c58b90a8 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -1475,6 +1475,10 @@ class WP_Rewrite {
 		if ( empty($this->rules) ) {
 			$this->matches = 'matches';
 			$this->rewrite_rules();
+			if ( ! did_action( 'wp_loaded' ) ) {
+				add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+				return $this->rules;
+			}
 			update_option('rewrite_rules', $this->rules);
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7bcc6f0218..fc0d525877 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38750';
+$wp_version = '4.7-alpha-38751';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.