diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 0aedbefef6..3503316ccf 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -1299,7 +1299,8 @@ function current_user_can( $capability ) {
  * @return bool
  */
 function current_user_can_for_blog( $blog_id, $capability ) {
-	switch_to_blog( $blog_id );
+	if ( is_multisite() )
+		switch_to_blog( $blog_id );
 
 	$current_user = wp_get_current_user();
 
@@ -1311,7 +1312,8 @@ function current_user_can_for_blog( $blog_id, $capability ) {
 
 	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
 
-	restore_current_blog();
+	if ( is_multisite() )
+		restore_current_blog();
 
 	return $can;
 }
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index f31b5e9465..7585fba951 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -1104,7 +1104,7 @@ final class WP_Theme implements ArrayAccess {
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id )
+		if ( ! $blog_id || ! is_multisite() )
 			$blog_id = get_current_blog_id();
 
 		if ( isset( $allowed_themes[ $blog_id ] ) )