diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index 25f63b6cf..91a5f897e 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -188,7 +188,7 @@ const string &ChatMessagePrivate::getAppdata () const {
 	for (const Content *c : contents) {
 		if (c->getContentType().isFile()) {
 			FileContent *fileContent = (FileContent *)c;
-			return fileContent->getFilePath();
+			return fileContent->getAppData("app");
 		}
 	}
 	return Utils::getEmptyConstRefObject<string>();
@@ -198,7 +198,8 @@ void ChatMessagePrivate::setAppdata (const string &data) {
 	for (const Content *c : contents) {
 		if (c->getContentType().isFile()) {
 			FileContent *fileContent = (FileContent *)c;
-			return fileContent->setFilePath(data);
+			fileContent->setAppData("app", data);
+			break;
 		}
 	}
 }
diff --git a/src/object/app-data-container.cpp b/src/object/app-data-container.cpp
index 2f26bc886..297a4f37a 100644
--- a/src/object/app-data-container.cpp
+++ b/src/object/app-data-container.cpp
@@ -19,6 +19,7 @@
 
 #include <memory>
 
+#include "linphone/utils/utils.h"
 #include "app-data-container.h"
 
 // =============================================================================
@@ -62,10 +63,10 @@ const unordered_map<string, string> &AppDataContainer::getAppDataMap () const {
 	return *d->appData.get();
 }
 
-string AppDataContainer::getAppData (const string &name) const {
+const string &AppDataContainer::getAppData (const string &name) const {
 	L_D();
 	auto it = d->appData->find(name);
-	return it == d->appData->cend() ? string() : it->second;
+	return it == d->appData->cend() ? Utils::getEmptyConstRefObject<string>() : d->appData->at(name);
 }
 
 void AppDataContainer::setAppData (const string &name, const string &appData) {
diff --git a/src/object/app-data-container.h b/src/object/app-data-container.h
index 90e2e416e..dec48042c 100644
--- a/src/object/app-data-container.h
+++ b/src/object/app-data-container.h
@@ -41,7 +41,7 @@ public:
 
 	const std::unordered_map<std::string, std::string> &getAppDataMap () const;
 
-	std::string getAppData (const std::string &name) const;
+	const std::string &getAppData (const std::string &name) const;
 	void setAppData (const std::string &name, const std::string &appData);
 	void setAppData (const std::string &name, std::string &&appData);