diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
index e9d7500261..4dcb81d216 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
@@ -102,7 +102,8 @@ Returns:
       //
       // Use the next free slot for a new entry
       //
-      UpdateIndex                   = mFvbCount++;;
+      UpdateIndex                   = mFvbCount++;
+			ASSERT (UpdateIndex < MAX_FVB_COUNT);      
       mFvbEntry[UpdateIndex].Handle = Handle;
     }
     //