diff --git a/src/avadapter.cpp b/src/avadapter.cpp
index fe0dcea34498dc231ca47d2bf812f59ca448ee4e..e568b087c1b9fa452318f12ab5e9aa59948d5e16 100644
--- a/src/avadapter.cpp
+++ b/src/avadapter.cpp
@@ -88,8 +88,12 @@ AvAdapter::shareEntireScreen(int screenNumber)
         return;
     QRect rect = screen->geometry();
 
-    LRCInstance::avModel()
-        .setDisplay(getScreenNumber(), rect.x(), rect.y(), rect.width(), rect.height(), getCurrentCallId());
+    LRCInstance::avModel().setDisplay(getScreenNumber(),
+                                      rect.x(),
+                                      rect.y(),
+                                      rect.width(),
+                                      rect.height(),
+                                      getCurrentCallId());
 }
 
 void
@@ -206,14 +210,12 @@ AvAdapter::stopAudioMeter(bool async)
     LRCInstance::stopAudioMeter(async);
 }
 
-const QString&
+QString
 AvAdapter::getCurrentCallId()
 {
     const auto& convInfo = LRCInstance::getConversationFromConvUid(LRCInstance::getCurrentConvUid());
     auto call = LRCInstance::getCallInfoForConversation(convInfo);
-    if (!call)
-        return QString();
-    return call->id;
+    return call ? call->id : QString();
 }
 
 void
diff --git a/src/avadapter.h b/src/avadapter.h
index 45bde4577f6c055d0912686577a425420068eee7..0e33c5ae607d52f03ba02323cfdc5f495e3f883e 100644
--- a/src/avadapter.h
+++ b/src/avadapter.h
@@ -91,7 +91,7 @@ private:
     /*
      * Get current callId from current selected conv id.
      */
-    const QString& getCurrentCallId();
+    QString getCurrentCallId();
 
     /*
      * Used to classify capture device events.