diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index c6e2736f4ce..b5f4d593a10 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -366,7 +366,8 @@ int mysql_update(THD *thd,
   {
     DBUG_RETURN(1);
   }
-  bool has_vers_fields= check_has_vers_fields(fields);
+  bool has_vers_fields=
+      table->versioned() ? check_has_vers_fields(fields) : false;
   if (check_key_in_view(thd, table_list))
   {
     my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "UPDATE");
diff --git a/storage/innobase/vers/vers0vtq.cc b/storage/innobase/vers/vers0vtq.cc
index 41be8bf7801..0e500234008 100644
--- a/storage/innobase/vers/vers0vtq.cc
+++ b/storage/innobase/vers/vers0vtq.cc
@@ -243,8 +243,13 @@ read_trx_id(const rec_t *rec) {
 */
 static
 void
-find_best_match(mtr_t &mtr, btr_pcur_t &pcur, bool backwards,
-	timeval commit_ts, const rec_t *rec) {
+find_best_match(
+	mtr_t &mtr,
+	btr_pcur_t &pcur,
+	bool backwards,
+	timeval commit_ts,
+	const rec_t *rec)
+{
 	btr_pcur_t best;
 	btr_pcur_init(&best);
 	btr_pcur_copy_stored_position(&best, &pcur);