diff --git a/smsapp/conversationlistmodel.cpp b/smsapp/conversationlistmodel.cpp
index 43814b623..b6a1a299e 100644
--- a/smsapp/conversationlistmodel.cpp
+++ b/smsapp/conversationlistmodel.cpp
@@ -53,7 +53,7 @@ void ConversationListModel::setDeviceId(const QString& deviceId)
         return;
     }
 
-    if (deviceId == "") {
+    if (deviceId.isEmpty()) {
         return;
     }
 
diff --git a/smsapp/conversationmodel.cpp b/smsapp/conversationmodel.cpp
index 5cea7dcef..0378182fb 100644
--- a/smsapp/conversationmodel.cpp
+++ b/smsapp/conversationmodel.cpp
@@ -52,7 +52,7 @@ void ConversationModel::setThreadId(const qint64& threadId)
     m_threadId = threadId;
     clear();
     knownMessageIDs.clear();
-    if (m_threadId != INVALID_THREAD_ID && m_deviceId != "") {
+    if (m_threadId != INVALID_THREAD_ID && !m_deviceId.isEmpty()) {
         requestMoreMessages();
     }
 }