diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index eabcfd818e..bc9f36b23a 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -453,11 +453,17 @@ class phpbb_db_tools
 
 					case 'firebird':
 					case 'mssql':
+						// We need the data here
+						$old_return_statements = $this->return_statements;
+						$this->return_statements = true;
+
 						$primary_key_stmts = $this->sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']);
 						foreach ($primary_key_stmts as $pk_stmt)
 						{
 							$statements[] = $pk_stmt;
 						}
+
+						$this->return_statements = $old_return_statements;
 					break;
 
 					case 'oracle':