diff --git a/log/log0log.c b/log/log0log.c
index e9dedf6aac4..5b4ca34b596 100644
--- a/log/log0log.c
+++ b/log/log0log.c
@@ -3039,10 +3039,22 @@ loop:
 
 	mutex_enter(&kernel_mutex);
 
-	/* Check that there are no longer transactions. We need this wait
-	even for the 'very fast' shutdown, because the InnoDB layer may have
-	committed or prepared transactions and we don't want to lose
-	them. */
+	/* We need the monitor threads to stop before we proceed with a
+	normal shutdown. In case of very fast shutdown, however, we can
+	proceed without waiting for monitor threads. */
+
+	if (srv_fast_shutdown < 2
+	   && (srv_error_monitor_active
+	      || srv_lock_timeout_and_monitor_active)) {
+		
+		mutex_exit(&kernel_mutex);
+		
+		goto loop;
+	}
+
+       /* Check that there are no longer transactions. We need this wait even
+        for the 'very fast' shutdown, because the InnoDB layer may have
+        committed or prepared transactions and we don't want to lose them. */
 
 	if (trx_n_mysql_transactions > 0
 	    || UT_LIST_GET_LEN(trx_sys->trx_list) > 0) {
@@ -3163,22 +3175,8 @@ loop:
 		goto loop;
 	}
 
-	/* The lock timeout thread should now have exited */
-
-	if (srv_lock_timeout_and_monitor_active) {
-
-		goto loop;
-	}
-
-	/* We now let also the InnoDB error monitor thread to exit */
-
 	srv_shutdown_state = SRV_SHUTDOWN_LAST_PHASE;
 
-	if (srv_error_monitor_active) {
-
-		goto loop;
-	}
-
 	/* Make some checks that the server really is quiet */
 	ut_a(srv_n_threads_active[SRV_MASTER] == 0);
 	ut_a(buf_all_freed());
diff --git a/srv/srv0srv.c b/srv/srv0srv.c
index dedd504e584..9f5328af9b4 100644
--- a/srv/srv0srv.c
+++ b/srv/srv0srv.c
@@ -1881,6 +1881,7 @@ srv_lock_timeout_and_monitor_thread(
 	double		time_elapsed;
 	time_t		current_time;
 	time_t		last_table_monitor_time;
+	time_t		last_tablespace_monitor_time;
 	time_t		last_monitor_time;
 	ibool		some_waits;
 	double		wait_time;
@@ -1893,6 +1894,7 @@ srv_lock_timeout_and_monitor_thread(
 	UT_NOT_USED(arg);
 	srv_last_monitor_time = time(NULL);
 	last_table_monitor_time = time(NULL);
+	last_tablespace_monitor_time = time(NULL);
 	last_monitor_time = time(NULL);
 loop:
 	srv_lock_timeout_and_monitor_active = TRUE;
@@ -1928,10 +1930,9 @@ loop:
 			mutex_exit(&srv_monitor_file_mutex);
 		}
 
-		if (srv_print_innodb_tablespace_monitor
-		    && difftime(current_time, last_table_monitor_time) > 60) {
-
-			last_table_monitor_time = time(NULL);
+	    if (srv_print_innodb_tablespace_monitor
+		&& difftime(current_time, last_tablespace_monitor_time) > 60) {
+		last_tablespace_monitor_time = time(NULL);	
 
 			fputs("========================"
 			      "========================\n",
@@ -2128,7 +2129,7 @@ loop:
 
 	os_thread_sleep(2000000);
 
-	if (srv_shutdown_state < SRV_SHUTDOWN_LAST_PHASE) {
+	if (srv_shutdown_state < SRV_SHUTDOWN_CLEANUP) {
 
 		goto loop;
 	}