diff --git a/limereport/items/lrtextitem.cpp b/limereport/items/lrtextitem.cpp
index 1134d32..fa924a8 100644
--- a/limereport/items/lrtextitem.cpp
+++ b/limereport/items/lrtextitem.cpp
@@ -367,13 +367,13 @@ bool TextItem::isNeedExpandContent() const
 {
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
     QRegExp rx("$*\\{[^{]*\\}");
+    return content().contains(rx) || isContentBackedUp();
 #else
     bool result = false;
     QRegularExpression rx("\\$*\\{[^{]*\\}");
     result = content().contains(rx) || isContentBackedUp();
     return result;
 #endif
-    return content().contains(rx) || isContentBackedUp();
 }
 
 QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); }
diff --git a/limereport/lrdatasourcemanager.cpp b/limereport/lrdatasourcemanager.cpp
index eb07c01..d3472ab 100644
--- a/limereport/lrdatasourcemanager.cpp
+++ b/limereport/lrdatasourcemanager.cpp
@@ -489,7 +489,6 @@ QString DataSourceManager::replaceVariables(QString value)
     }
     return value;
 #endif
-    return QString();
 }
 
 QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam)