diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result
index 211a7d3398d..4e1f03643f1 100644
--- a/mysql-test/suite/perfschema/r/rpl_statements.result
+++ b/mysql-test/suite/perfschema/r/rpl_statements.result
@@ -14,7 +14,6 @@ include/master-slave.inc
 show variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
-wsrep_forced_binlog_format	NONE
 drop table if exists test.marker;
 select thread_id into @my_thread_id
 from performance_schema.threads
@@ -59,7 +58,6 @@ Expect 1
 show variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
-wsrep_forced_binlog_format	NONE
 *** Clear statement events
 
 *** Create/drop table, create/drop database
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 741ba08386d..4d6becff599 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3275,10 +3275,11 @@ mysql_execute_command(THD *thd)
         /* in STATEMENT format, we probably have to replicate also temporary
            tables, like mysql replication does
         */
-	  if (WSREP_ON && (!thd->is_current_stmt_binlog_format_row() ||
-	      !(create_info.options & HA_LEX_CREATE_TMP_TABLE)))
-          WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name,
-                                   NULL)
+        if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() ||
+            !(create_info.options & HA_LEX_CREATE_TMP_TABLE)))
+        {
+	  WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL)
+        }
 #endif /* WITH_WSREP */
         /* Regular CREATE TABLE */
         res= mysql_create_table(thd, create_table,