diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index f0dcb9477d..90e43d2b6f 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -183,6 +183,10 @@ function get_blog_details( $fields = null, $get_all = true ) {
 				wp_cache_delete( $blog_id . $all, 'blog-details' );
 				unset($details);
 			}
+		} elseif ( ! $details->blog_id || ! $details->site_id ) {
+			// Clear objects missing critical properties.
+			wp_cache_delete( $blog_id . $all, 'blog-details' );
+			unset($details);
 		} else {
 			return $details;
 		}
@@ -203,13 +207,17 @@ function get_blog_details( $fields = null, $get_all = true ) {
 					wp_cache_delete( $blog_id, 'blog-details' );
 					unset($details);
 				}
+			} elseif ( ! $details->blog_id || ! $details->site_id ) {
+				// Clear objects missing critical properties.
+				wp_cache_delete( $blog_id, 'blog-details' );
+				unset($details);
 			} else {
 				return $details;
 			}
 		}
 	}
 
-	if ( empty($details) ) {
+	if ( empty( $details ) || ! $details->blog_id || ! $details->site_id ) {
 		$details = WP_Site::get_instance( $blog_id );
 		if ( ! $details ) {
 			// Set the full cache.