diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 2ae589a..8000f97 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -137,7 +137,7 @@
     StrCat (UnicodeArgs, SerialNoArgs);
   }
 
-  BdsLoadOptions->OptionalDataSize = 512;
+  BdsLoadOptions->OptionalDataSize = StrSize (UnicodeArgs);
   BdsLoadOptions->OptionalData = UnicodeArgs;
   BdsLoadOptions->Description = NULL;