diff --git a/df_datalink_sp/src/networking/link_layer/scan.c b/df_datalink_sp/src/networking/link_layer/scan.c
index 8729018..256f8c5 100644
--- a/df_datalink_sp/src/networking/link_layer/scan.c
+++ b/df_datalink_sp/src/networking/link_layer/scan.c
@@ -366,7 +366,8 @@ int32_t L2_Scan_PktHandler(L2_INST *instPtr, uint8_t *msg)
 	ASSERT(msg != NULL);
 	int32_t Status;
 	L2_SCAN_FSM *scanFsmPtr = instPtr->scanFSM;
-	switch (L2_GetLastFrameType(instPtr))
+	L2_FRAME_TYPE frameType = L2_GetLastOptFrameType(instPtr);
+	switch (frameType)
 	{
 	case L2_SCAN_FRAME:
 		LockStateUpdate(scanFsmPtr, true);