diff --git a/components/fpdebug/fpdbgdisasx86.pp b/components/fpdebug/fpdbgdisasx86.pp
index 09e544c8e1..6f861bb412 100644
--- a/components/fpdebug/fpdbgdisasx86.pp
+++ b/components/fpdebug/fpdbgdisasx86.pp
@@ -4040,6 +4040,9 @@ begin
   else
     SetOpcode(OPX_InvalidVex);
   end;
+
+  if not HasOpcode
+  then SetOpcode(OPX_InvalidVex);
 end;
 
 procedure TX86Disassembler.DoDisassemble;