diff --git a/CHANGELOG.md b/CHANGELOG.md
index b85ab9aa..157d60ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v7.1.16 - 2018-03-16
+
+* In /v1/apps/:appId/stop, wait for the service to exit before responding #593 [Pablo Carranza Velez]
+
 ## v7.1.15 - 2018-03-15
 
 * Automation: Use ssh instead of https to PR to meta-resin #572 [Pablo Carranza Velez]
diff --git a/package.json b/package.json
index 5306dbf0..09c76493 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "7.1.15",
+  "version": "7.1.16",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
diff --git a/src/application-manager.coffee b/src/application-manager.coffee
index a4f37b05..ec11e62e 100644
--- a/src/application-manager.coffee
+++ b/src/application-manager.coffee
@@ -127,7 +127,7 @@ createApplicationManagerRouter = (applications) ->
 			if app.services.length > 1
 				return res.status(400).send('Some v1 endpoints are only allowed on single-container apps')
 			applications.setTargetVolatileForService(service.imageId, running: action != 'stop')
-			applications.executeStepAction(serviceAction(action, service.serviceId, service, service), { force })
+			applications.executeStepAction(serviceAction(action, service.serviceId, service, service, { wait: true }), { force })
 			.then ->
 				if action == 'stop'
 					return service