diff --git a/src/client/ui/templates/stash/stash.js b/src/client/ui/templates/stash/stash.js
index 3265b01e..7b60bb62 100644
--- a/src/client/ui/templates/stash/stash.js
+++ b/src/client/ui/templates/stash/stash.js
@@ -112,18 +112,6 @@ define([
 			events.emit('onShowItemTooltip', item, ttPos, true);
 		},
 
-		onClick: function (el, item) {
-			client.request({
-				cpn: 'player',
-				method: 'performAction',
-				data: {
-					cpn: 'equipment',
-					method: 'equip',
-					data: item.id
-				}
-			});
-		},
-
 		onGetStashItems: function (items) {
 			this.items = items;
 
diff --git a/src/server/components/dialogue.js b/src/server/components/dialogue.js
index 5deb2cf1..b1d16b7e 100644
--- a/src/server/components/dialogue.js
+++ b/src/server/components/dialogue.js
@@ -15,7 +15,7 @@ module.exports = {
 			this.trigger.destroyed = true;
 	},
 
-	talk: function (msg) {
+	talk: async function (msg) {
 		if (!msg)
 			return false;
 
@@ -41,7 +41,7 @@ module.exports = {
 		if ((target.trade) && (target.trade.faction))
 			this.obj.reputation.discoverFaction(target.trade.faction.id);
 
-		let state = target.dialogue.getState(this.obj, msg.state);
+		let state = await target.dialogue.getState(this.obj, msg.state);
 		if (!state) {
 			this.obj.syncer.set(true, 'dialogue', 'state', null);
 			return false;
@@ -54,7 +54,8 @@ module.exports = {
 		this.obj.syncer.set(true, 'dialogue', 'state', null);
 	},
 
-	getState: function (sourceObj, state = 1) {
+	/* eslint-disable-next-line max-lines-per-function */
+	getState: async function (sourceObj, state = 1) {
 		let result = null;
 		if ((state + '').indexOf('.') > -1) {
 			let config = this.states[(state + '').split('.')[0]];
@@ -93,8 +94,9 @@ module.exports = {
 
 			if (stateConfig.goto) {
 				if (result)
-					return this.getState(sourceObj, stateConfig.goto.success);
-				return this.getState(sourceObj, stateConfig.goto.failure);
+					return await this.getState(sourceObj, stateConfig.goto.success);
+
+				return await this.getState(sourceObj, stateConfig.goto.failure);
 			} 
 			if (result) {
 				useMsg = extend([], useMsg);
@@ -102,7 +104,7 @@ module.exports = {
 			} else
 				return null;
 		} else if (stateConfig.method) {
-			let methodResult = stateConfig.method.call(this.obj, sourceObj);
+			let methodResult = await stateConfig.method.call(this.obj, sourceObj);
 			if (methodResult) {
 				useMsg = extend([], useMsg);
 				useMsg[0].msg = methodResult;