diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e2489f7706f52..3824cbacbee20 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5598,6 +5598,7 @@ int mysqld_main(int argc, char **argv)
   if (Events::init((THD*) 0, opt_noacl || opt_bootstrap))
     unireg_abort(1);
 
+#ifdef WITH_WSREP
   if (WSREP_ON)
   {
     if (opt_bootstrap)
@@ -5609,14 +5610,15 @@ int mysqld_main(int argc, char **argv)
       wsrep_init_globals();
       if (!wsrep_before_SE())
       {
-        wsrep_init_startup (false);
+        wsrep_init_startup(false);
       }
-
+      wsrep_new_cluster= false;
       WSREP_DEBUG("Startup creating %ld applier threads running %lu",
 	      wsrep_slave_threads - 1, wsrep_running_applier_threads);
       wsrep_create_appliers(wsrep_slave_threads - 1);
     }
   }
+#endif /* WITH_WSREP */
 
   if (opt_bootstrap)
   {
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 4c1d683b03e8c..52ee3219ee519 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -752,7 +752,6 @@ void wsrep_init_globals()
     wsrep_get_binlog_gtid_seqno(gtid);
     wsrep_gtid_server.seqno(gtid.seqno);
   }
-  wsrep_new_cluster= 0;
   wsrep_init_schema();
   if (WSREP_ON)
   {