diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 5ead0d19bc6..a2025ef0706 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -567,16 +567,24 @@ static struct ada_quirk_entry ada_quirk_table[] =
 		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 850*", "*" },
 		/*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
 	},
+	{
+		/*
+		 * Samsung SM863 Series SSDs (MZ7KM*)
+		 * 4k optimised, NCQ believed to be working
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7KM*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
 	{
 		/*
 		 * Samsung 843T Series SSDs (MZ7WD*)
 		 * Samsung PM851 Series SSDs (MZ7TE*)
 		 * Samsung PM853T Series SSDs (MZ7GE*)
-		 * Samsung SM863 Series SSDs (MZ7KM*)
-		 * 4k optimised, NCQ Trim believed working
+		 * 4k optimised, NCQ believed to be broken since these are
+		 * appear to be built with the same controllers as the 840/850.
 		 */
 		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "SAMSUNG MZ7*", "*" },
-		/*quirks*/ADA_Q_4K
+		/*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
 	},
 	{
 		/*