diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 7bfd1715e9b..f45e4c98e81 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -2246,17 +2246,32 @@ files_checked:
 
 		recv_sys->dblwr.pages.clear();
 
-		if (err == DB_SUCCESS) {
-			/* Initialize the change buffer. */
-			err = dict_boot();
-		}
-
 		if (err != DB_SUCCESS) {
 			return(srv_init_abort(err));
 		}
 
-		/* This must precede recv_apply_hashed_log_recs(true). */
-		trx_sys_init_at_db_start();
+		switch (srv_operation) {
+		case SRV_OPERATION_NORMAL:
+		case SRV_OPERATION_RESTORE_EXPORT:
+			/* Initialize the change buffer. */
+			err = dict_boot();
+			if (err != DB_SUCCESS) {
+				return(srv_init_abort(err));
+			}
+			/* This must precede
+			recv_apply_hashed_log_recs(true). */
+			trx_sys_init_at_db_start();
+			break;
+		case SRV_OPERATION_RESTORE_DELTA:
+		case SRV_OPERATION_BACKUP:
+			ut_ad(!"wrong mariabackup mode");
+			/* fall through */
+		case SRV_OPERATION_RESTORE:
+			/* mariabackup --prepare only deals with
+			the redo log and the data files, not with
+			transactions or the data dictionary. */
+			break;
+		}
 
 		if (srv_force_recovery < SRV_FORCE_NO_LOG_REDO) {
 			/* Apply the hashed log records to the