diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js
index 93532e4ea6..b0ad765900 100644
--- a/dist/habitrpg-shared.js
+++ b/dist/habitrpg-shared.js
@@ -11457,7 +11457,7 @@ var process=require("__browserify_process");(function() {
           if (message == null) {
             message = "Bought " + item.text + ".";
           }
-          if (((_ref = item.klass) === 'warrior' || _ref === 'wizard' || _ref === 'healer' || _ref === 'rogue') && user.fns.getItem('weapon').last && user.fns.getItem('armor').last && user.fns.getItem('head').last && user.fns.getItem('shield').last) {
+          if (((_ref = item.klass) === 'warrior' || _ref === 'wizard' || _ref === 'healer' || _ref === 'rogue') && user.fns.getItem('weapon').last && user.fns.getItem('armor').last && user.fns.getItem('head').last && (user.fns.getItem('shield').last || user.fns.getItem('weapon').twoHanded)) {
             user.achievements.ultimateGear = true;
           }
         }
diff --git a/script/index.coffee b/script/index.coffee
index a0daa00bab..a9cccf5f8f 100644
--- a/script/index.coffee
+++ b/script/index.coffee
@@ -533,7 +533,7 @@ api.wrap = (user) ->
         user.items.gear.owned[item.key] = true
         message = user.fns.handleTwoHanded(item)
         message ?= "Bought #{item.text}."
-        if item.klass in ['warrior','wizard','healer','rogue'] and user.fns.getItem('weapon').last and user.fns.getItem('armor').last and user.fns.getItem('head').last and user.fns.getItem('shield').last
+        if item.klass in ['warrior','wizard','healer','rogue'] and user.fns.getItem('weapon').last and user.fns.getItem('armor').last and user.fns.getItem('head').last and (user.fns.getItem('shield').last or user.fns.getItem('weapon').twoHanded)
           user.achievements.ultimateGear = true
       user.stats.gp -= item.value
       cb? {code:200, message}, req