diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 62a463c5d..96b84bf36 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -516,14 +516,11 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
 					content = new Content();
 
 				// 2.2 - Fetch contents' app data.
-				static const string content_app_data_query = "SELECT name, data FROM chat_message_content_app_data"
-					" WHERE chat_message_content_id = :messageContentId";
-				soci::rowset<soci::row> content_app_data_rows = (session->prepare << content_app_data_query, soci::use(contentId));
-				for (const auto &content_app_data_row : content_app_data_rows) {
-					string content_app_data_name(content_app_data_row.get<string>(0));
-					string content_app_data_value(content_app_data_row.get<string>(1));
-					content->setAppData(content_app_data_name, content_app_data_value);
-				}
+				static const string query = "SELECT name, data FROM chat_message_content_app_data"
+					"  WHERE chat_message_content_id = :contentId";
+				soci::rowset<soci::row> rows = (session->prepare << query, soci::use(contentId));
+				for (const auto &row : rows)
+					content->setAppData(row.get<string>(0), row.get<string>(1));
 
 				content->setContentType(contentType);
 				content->setBody(row.get<string>(3));