diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 9b1043393e7..97d214e1f17 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2018,10 +2018,6 @@ retry_share:
       goto err_lock;
     }
 
-    /* Open view */
-    if (mysql_make_view(thd, share, table_list, false))
-      goto err_lock;
-
     /*
       This table is a view. Validate its metadata version: in particular,
       that it was a view when the statement was prepared.
@@ -2029,6 +2025,10 @@ retry_share:
     if (check_and_update_table_version(thd, table_list, share))
       goto err_lock;
 
+    /* Open view */
+    if (mysql_make_view(thd, share, table_list, false))
+      goto err_lock;
+
     /* TODO: Don't free this */
     tdc_release_share(share);