diff --git a/storage/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
index 7abd014a364..da58d8392cf 100644
--- a/storage/innobase/buf/buf0flu.c
+++ b/storage/innobase/buf/buf0flu.c
@@ -2103,7 +2103,15 @@ buf_flush_stat_update(void)
 	ib_uint64_t		lsn;
 	ulint			n_flushed;
 
-	lsn = log_get_lsn();
+	lsn = log_get_lsn_nowait();
+
+	/* log_get_lsn_nowait tries to get log_sys->mutex with
+	mutex_enter_nowait, if this does not succeed function
+	returns 0, do not use that value to update stats. */
+	if (lsn == 0) {
+		return;
+	}
+
 	if (buf_flush_stat_cur.redo == 0) {
 		/* First time around. Just update the current LSN
 		and return. */
diff --git a/storage/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic
index a55bbeff789..8c8dc096a10 100644
--- a/storage/innobase/include/log0log.ic
+++ b/storage/innobase/include/log0log.ic
@@ -419,14 +419,14 @@ lsn_t
 log_get_lsn_nowait(void)
 /*=============*/
 {
-	lsn_t	lsn;
+	lsn_t	lsn=0;
 
-        if (mutex_enter_nowait(&(log_sys->mutex)))
-          return 0;
+	if (!mutex_enter_nowait(&(log_sys->mutex))) {
 
-	lsn = log_sys->lsn;
+		lsn = log_sys->lsn;
 
-	mutex_exit(&(log_sys->mutex));
+		mutex_exit(&(log_sys->mutex));
+	}
 
 	return(lsn);
 }
diff --git a/storage/xtradb/buf/buf0flu.c b/storage/xtradb/buf/buf0flu.c
index aa93053abae..43f6a4510a2 100644
--- a/storage/xtradb/buf/buf0flu.c
+++ b/storage/xtradb/buf/buf0flu.c
@@ -2214,7 +2214,15 @@ buf_flush_stat_update(void)
 	ib_uint64_t		lsn;
 	ulint			n_flushed;
 
-	lsn = log_get_lsn();
+	lsn = log_get_lsn_nowait();
+
+	/* log_get_lsn_nowait tries to get log_sys->mutex with
+	mutex_enter_nowait, if this does not succeed function
+	returns 0, do not use that value to update stats. */
+	if (lsn == 0) {
+		return;
+	}
+
 	if (buf_flush_stat_cur.redo == 0) {
 		/* First time around. Just update the current LSN
 		and return. */
diff --git a/storage/xtradb/include/log0log.ic b/storage/xtradb/include/log0log.ic
index 82f1912c584..36bc5186c22 100644
--- a/storage/xtradb/include/log0log.ic
+++ b/storage/xtradb/include/log0log.ic
@@ -434,14 +434,14 @@ lsn_t
 log_get_lsn_nowait(void)
 /*=============*/
 {
-	lsn_t	lsn;
+	lsn_t	lsn=0;
 
-        if (mutex_enter_nowait(&(log_sys->mutex)))
-          return 0;
+	if (!mutex_enter_nowait(&(log_sys->mutex))) {
 
-	lsn = log_sys->lsn;
+		lsn = log_sys->lsn;
 
-	mutex_exit(&(log_sys->mutex));
+		mutex_exit(&(log_sys->mutex));
+	}
 
 	return(lsn);
 }