diff --git a/src/settingsadhoccommand.cpp b/src/settingsadhoccommand.cpp
index 00aacece68095a389c86cd22b7317e1b9131e47a..5aea25ec668381c4477c830afcd9987995282d44 100644
--- a/src/settingsadhoccommand.cpp
+++ b/src/settingsadhoccommand.cpp
@@ -53,13 +53,16 @@ boost::shared_ptr<Swift::Command> SettingsAdHocCommand::handleResponse(boost::sh
 	
 	
 
-	boost::shared_ptr<Swift::Command> response;
-	response->setStatus(Swift::Command::Completed);
+	boost::shared_ptr<Swift::Command> response(new Swift::Command("settings", m_id, Swift::Command::Completed));
 	return response;
 }
 
 boost::shared_ptr<Swift::Command> SettingsAdHocCommand::handleRequest(boost::shared_ptr<Swift::Command> payload) {
 	boost::shared_ptr<Swift::Command> response;
+	if (payload->getAction() == Swift::Command::Cancel) {
+		response = boost::shared_ptr<Swift::Command>(new Swift::Command("settings", m_id, Swift::Command::Canceled));
+		return response;
+	}
 
 	switch (m_state) {
 		case Init: