diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
index 562a7471f..20d2cfb06 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/PasswordRecordMapper.xml
@@ -34,7 +34,7 @@
     <!-- Select all password records for a given user -->
     <select id="select" resultMap="PasswordRecordResultMap">
 
-        SELECT
+        SELECT TOP (#{maxHistorySize,jdbcType=INTEGER})
             [guacamole_user_password_history].user_id,
             [guacamole_user_password_history].password_hash,
             [guacamole_user_password_history].password_salt,
@@ -45,7 +45,6 @@
             [guacamole_user].username = #{username,jdbcType=VARCHAR}
         ORDER BY
             [guacamole_user_password_history].password_date DESC
-        LIMIT #{maxHistorySize}
 
     </select>
 
@@ -66,12 +65,12 @@
         );
 
         DELETE FROM [guacamole_user_password_history]
-        WHERE password_history_id IN (
-            SELECT password_history_id
+        WHERE user_id = #{record.userID,jdbcType=INTEGER}
+        AND password_history_id NOT IN (
+            SELECT TOP(#{maxHistorySize}) password_history_id
             FROM [guacamole_user_password_history]
             WHERE user_id = #{record.userID,jdbcType=INTEGER}
             ORDER BY password_date DESC
-            OFFSET #{maxHistorySize}
         );
 
     </insert>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserRecordMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserRecordMapper.xml
index 0143dda04..22a0cc75f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserRecordMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/user/UserRecordMapper.xml
@@ -89,7 +89,7 @@
     <!-- Search for specific user records -->
     <select id="search" resultMap="UserRecordResultMap">
 
-        SELECT
+        SELECT TOP (#{limit,jdbcType=INTEGER})
             [guacamole_user_history].remote_host,
             [guacamole_user_history].user_id,
             [guacamole_user_history].username,
@@ -128,14 +128,12 @@
             <if test="sortPredicate.descending">DESC</if>
         </foreach>
 
-        LIMIT #{limit,jdbcType=INTEGER}
-
     </select>
 
     <!-- Search for specific user records -->
     <select id="searchReadable" resultMap="UserRecordResultMap">
 
-        SELECT
+        SELECT TOP (#{limit,jdbcType=INTEGER})
             [guacamole_user_history].remote_host,
             [guacamole_user_history].user_id,
             [guacamole_user_history].username,
@@ -180,8 +178,6 @@
             <if test="sortPredicate.descending">DESC</if>
         </foreach>
 
-        LIMIT #{limit,jdbcType=INTEGER}
-
     </select>
 
 </mapper>