diff --git a/src/platforms/pc-stlinkv2/stlinkv2.c b/src/platforms/pc-stlinkv2/stlinkv2.c
index 1d76c9f7..eadc42df 100644
--- a/src/platforms/pc-stlinkv2/stlinkv2.c
+++ b/src/platforms/pc-stlinkv2/stlinkv2.c
@@ -49,7 +49,7 @@
 #endif
 
 #define VENDOR_ID_STLINK		0x483
-#define PRODUCT_ID_STLINK_MASK	0xfff0
+#define PRODUCT_ID_STLINK_MASK	0xffe0
 #define PRODUCT_ID_STLINK_GROUP 0x3740
 #define PRODUCT_ID_STLINKV1		0x3744
 #define PRODUCT_ID_STLINKV2		0x3748
@@ -733,6 +733,10 @@ void stlink_init(int argc, char **argv)
 						DEBUG("STLINKV21 serial %s\n", Stlink.serial);
 						Stlink.ver_hw = 21;
 						Stlink.ep_tx = 1;
+					} else if (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) {
+						DEBUG("STLINKV21_MSD serial %s\n", Stlink.serial);
+						Stlink.ver_hw = 21;
+						Stlink.ep_tx = 1;
 					} else if (desc.idProduct == PRODUCT_ID_STLINKV3E) {
 						DEBUG("STLINKV3E serial %s\n", Stlink.serial);
 						Stlink.ver_hw = 30;