diff --git a/app/bundles/SmsBundle/Assets/js/sms.js b/app/bundles/SmsBundle/Assets/js/sms.js
index c3cd558273f..7f323a6cf50 100644
--- a/app/bundles/SmsBundle/Assets/js/sms.js
+++ b/app/bundles/SmsBundle/Assets/js/sms.js
@@ -1,9 +1,13 @@
 /** SmsBundle **/
 Mautic.smsOnLoad = function (container, response) {
-    Mautic.setSmsCharactersCount();
-    mQuery('#sms_message').on("input", () => {
-        Mautic.setSmsCharactersCount();
-    });
+    const smsMessage = mQuery('#sms_message');
+
+    if (smsMessage.length) {
+        Mautic.setSmsCharactersCount(smsMessage);
+        smsMessage.on('input', () => {
+            Mautic.setSmsCharactersCount(smsMessage);
+        });
+    }
 
     if (mQuery(container + ' #list-search').length) {
         Mautic.activateSearchAutocomplete('list-search', 'sms');
@@ -42,8 +46,8 @@ Mautic.smsOnLoad = function (container, response) {
     }
 };
 
-Mautic.setSmsCharactersCount = function () {
-    mQuery('#sms_nb_char').text((mQuery('#sms_message').val().length))
+Mautic.setSmsCharactersCount = function (smsMessage) {
+    mQuery('#sms_nb_char').text((smsMessage.val().length))
 };
 
 Mautic.selectSmsType = function(smsType) {
diff --git a/app/bundles/SmsBundle/Entity/SmsRepository.php b/app/bundles/SmsBundle/Entity/SmsRepository.php
index 8daa8dbfcd6..33d71b907d9 100644
--- a/app/bundles/SmsBundle/Entity/SmsRepository.php
+++ b/app/bundles/SmsBundle/Entity/SmsRepository.php
@@ -63,7 +63,7 @@ public function getSegmentsContactsQuery(int $smsId)
     {
         // Main query
         $q = $this->getEntityManager()->getConnection()->createQueryBuilder();
-        $q->from('sms_message_list_xref', 'sml')
+        $q->from(MAUTIC_TABLE_PREFIX.'sms_message_list_xref', 'sml')
             ->join('sml', MAUTIC_TABLE_PREFIX.'lead_lists', 'll', 'll.id = sml.leadlist_id and ll.is_published = 1')
             ->join('ll', MAUTIC_TABLE_PREFIX.'lead_lists_leads', 'lll', 'lll.leadlist_id = sml.leadlist_id and lll.manually_removed = 0')
             ->join('lll', MAUTIC_TABLE_PREFIX.'leads', 'l', 'lll.lead_id = l.id')