diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php
index 1b58238c927..69ab678cebb 100644
--- a/lib/dml/mssql_native_moodle_database.php
+++ b/lib/dml/mssql_native_moodle_database.php
@@ -453,7 +453,8 @@ class mssql_native_moodle_database extends moodle_database {
                                quotename(table_name)), column_name, 'IsIdentity') AS auto_increment,
                            column_default AS default_value
                       FROM tempdb.information_schema.columns
-                     WHERE table_name like '{" . $table . "}__________%'
+                      JOIN tempdb..sysobjects ON name = table_name
+                     WHERE id = object_id('tempdb..{" . $table . "}')
                   ORDER BY ordinal_position";
         }