diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 16a43d0def7..f1c6d03114a 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -11763,7 +11763,7 @@ ha_innobase::create(
 						      &mtr);
 
 		/* Set up new crypt data */
-		fil_space_set_crypt_data(innobase_table->space, crypt_data);
+		crypt_data = fil_space_set_crypt_data(innobase_table->space, crypt_data);
 
 		/* Compute location to store crypt data */
 		byte* frame = buf_block_get_frame(block);
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index 79013e428aa..99216f022fb 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -12276,7 +12276,7 @@ ha_innobase::create(
 						      &mtr);
 
 		/* Set up new crypt data */
-		fil_space_set_crypt_data(innobase_table->space, crypt_data);
+		crypt_data = fil_space_set_crypt_data(innobase_table->space, crypt_data);
 
 		/* Compute location to store crypt data */
 		byte* frame = buf_block_get_frame(block);