diff --git a/src/audit_offsets.cc b/src/audit_offsets.cc
index 0684ed1..0054d4f 100644
--- a/src/audit_offsets.cc
+++ b/src/audit_offsets.cc
@@ -75,6 +75,8 @@ const ThdOffsets thd_offsets_arr[] =
 const ThdOffsets thd_offsets_arr[] =
 {
 	/* +++ MYSQL 64 OFFSETS GO HERE +++ */
+	//offsets for: /mysqlrpm/8.0.28/usr/sbin/mysqld (8.0.28)
+	{"8.0.28","cc02813522da1546b08bbb2f5bf4a7c7", 8584, 8624, 4120, 5600, 496, 0, 0, 32, 64, 160, 584, 8724, 5224, 4232, 4240, 4244, 6880, 1608, 32, 7840, 7880, 7864, 11608, 140, 664, 328},
 	//offsets for: /mysqlrpm/5.7.36/usr/sbin/mysqld (5.7.36)
 	{"5.7.36","a510b439fd43a666e34b5e670bb5da86", 7832, 7880, 3640, 4800, 456, 360, 0, 32, 64, 160, 544, 7996, 4368, 3648, 3656, 3660, 6080, 2072, 8, 7064, 7104, 7088, 13480, 148, 672, 0},
 	//offsets for: /mysqlrpm/5.7.35/usr/sbin/mysqld (5.7.35)
diff --git a/src/audit_plugin.cc b/src/audit_plugin.cc
index 72a9b56..5d8fccd 100644
--- a/src/audit_plugin.cc
+++ b/src/audit_plugin.cc
@@ -1648,6 +1648,47 @@ const char *retrieve_command(THD *thd, bool &is_sql_cmd)
 
 	if (! cmd)
 	{
+#if MYSQL_VERSION_ID > 80025
+        const LEX_CSTRING command_name[] = {
+            {STRING_WITH_LEN("Sleep")},
+            {STRING_WITH_LEN("Quit")},
+            {STRING_WITH_LEN("Init DB")},
+            {STRING_WITH_LEN("Query")},
+            {STRING_WITH_LEN("Field List")},
+            {STRING_WITH_LEN("Create DB")},
+            {STRING_WITH_LEN("Drop DB")},
+            {STRING_WITH_LEN("Refresh")},
+            {STRING_WITH_LEN("Shutdown")},
+            {STRING_WITH_LEN("Statistics")},
+            {STRING_WITH_LEN("Processlist")},
+            {STRING_WITH_LEN("Connect")},
+            {STRING_WITH_LEN("Kill")},
+            {STRING_WITH_LEN("Debug")},
+            {STRING_WITH_LEN("Ping")},
+            {STRING_WITH_LEN("Time")},
+            {STRING_WITH_LEN("Delayed insert")},
+            {STRING_WITH_LEN("Change user")},
+            {STRING_WITH_LEN("Binlog Dump")},
+            {STRING_WITH_LEN("Table Dump")},
+            {STRING_WITH_LEN("Connect Out")},
+            {STRING_WITH_LEN("Register Slave")},
+            {STRING_WITH_LEN("Prepare")},
+            {STRING_WITH_LEN("Execute")},
+            {STRING_WITH_LEN("Long Data")},
+            {STRING_WITH_LEN("Close stmt")},
+            {STRING_WITH_LEN("Reset stmt")},
+            {STRING_WITH_LEN("Set option")},
+            {STRING_WITH_LEN("Fetch")},
+            {STRING_WITH_LEN("Daemon")},
+            {STRING_WITH_LEN("Binlog Dump GTID")},
+            {STRING_WITH_LEN("Reset Connection")},
+            {STRING_WITH_LEN("clone")},
+#if MYSQL_VERSION_ID > 80026
+            {STRING_WITH_LEN("Group Replication Data Stream subscription")},
+#endif
+            {STRING_WITH_LEN("Error")}  // Last command number
+        };
+#endif
 		cmd = command_name[command].str;
 	}