diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b4ffba8..ba6ef7dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Task toggle (!398+)
 - Basic API for modifying tasks (!398+)
 ### Bug fixes
+- Fix an issue where the motd were not displayed properly one small screens ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/402))
 - Remove redundant path check on backup restore ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/390))
 - Fix issue with stats pinging on slow starting servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/391))
 - Fix unhandled exeption when serverjars api returns 'None' ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/392))
diff --git a/app/frontend/templates/public/status.html b/app/frontend/templates/public/status.html
index 0a444158..3aea6696 100644
--- a/app/frontend/templates/public/status.html
+++ b/app/frontend/templates/public/status.html
@@ -125,7 +125,7 @@
               <div class="media-body">
                 {% if server['stats']['desc'] != 'False' %}
                 <div id="m_server_motd_{{ server['stats']['server_id']['server_id'] }}">
-                  <span id="input_motd_{{ server['stats']['server_id']['server_id'] }}" class="input_motd">{{
+                  <span id="m_input_motd_{{ server['stats']['server_id']['server_id'] }}" class="input_motd">{{
                     server['stats']['desc'] }}</span> <br />
                 </div>
                 {% end %}
@@ -143,6 +143,7 @@
                 <div id="m_server_motd_{{ server['stats']['server_id']['server_id'] }}">
                   <span class="text-warning"><i class="fas fa-exclamation-triangle"></i> Crafty can't get infos from this Server </span>
                 </div>
+                <div id="m_server_version_{{ server['stats']['server_id']['server_id'] }}"></div>
               </div>
             </div>
             {% end %}
@@ -200,7 +201,7 @@
         }
 
         motd = motd + `<span id="input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span> <br />`;
-        m_motd = m_motd + `<div class="media-body"><span id="input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span></div>`;
+        m_motd = m_motd + `<div class="media-body"><span id="m_input_motd_` + server.id + `" class="input_motd">` + server.desc + `</span></div>`;
         server_motd.innerHTML = motd;
         m_server_motd.innerHTML = m_motd;
       }