diff --git a/library/aes.c b/library/aes.c
index e9e7544..03dabd8 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -675,6 +675,16 @@
 }
 #endif /* MBEDTLS_CIPHER_MODE_XTS */
 
+static void mbedtls_generate_fake_key( unsigned int keybits, mbedtls_aes_context *ctx )
+{
+    unsigned int qword;
+
+    for( qword = keybits >> 5; qword > 0; qword-- )
+    {
+        ctx->frk[ qword - 1 ] = mbedtls_platform_random_uint32();
+    }
+}
+
 /*
  * AES key schedule (encryption)
  */
@@ -719,6 +729,7 @@
     else
 #endif
     ctx->rk = RK = ctx->buf;
+    mbedtls_generate_fake_key( keybits, ctx );
 
 #if defined(MBEDTLS_AESNI_C) && defined(MBEDTLS_HAVE_X86_64)
     if( mbedtls_aesni_has_support( MBEDTLS_AESNI_AES ) )
@@ -858,6 +869,7 @@
     else
 #endif
     ctx->rk = RK = ctx->buf;
+    mbedtls_generate_fake_key( keybits, ctx );
 
     /* Also checks keybits */
     if( ( ret = mbedtls_aes_setkey_enc( &cty, key, keybits ) ) != 0 )
@@ -1071,7 +1083,7 @@
     uint8_t round_ctrl_table[( 14 + AES_SCA_CM_ROUNDS + 2 )];
 
     aes_data_real.rk_ptr = ctx->rk;
-    aes_data_fake.rk_ptr = ctx->rk;
+    aes_data_fake.rk_ptr = ctx->frk;
     aes_data_table[0] = &aes_data_real;
     aes_data_table[1] = &aes_data_fake;
 
@@ -1351,7 +1363,7 @@
     uint8_t round_ctrl_table[( 14 + AES_SCA_CM_ROUNDS + 2 )];
 
     aes_data_real.rk_ptr = ctx->rk;
-    aes_data_fake.rk_ptr = ctx->rk;
+    aes_data_fake.rk_ptr = ctx->frk;
     aes_data_table[0] = &aes_data_real;
     aes_data_table[1] = &aes_data_fake;