diff --git a/server/model/monitor.js b/server/model/monitor.js
index 0d915c375..312ac732b 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -39,7 +39,6 @@ class Monitor extends BeanModel {
             id: this.id,
             name: this.name,
             sendUrl: this.sendUrl,
-            description: this.description,
         };
 
         if (this.sendUrl) {
diff --git a/src/components/MonitorList.vue b/src/components/MonitorList.vue
index 5a6e5ef4c..d64b43c18 100644
--- a/src/components/MonitorList.vue
+++ b/src/components/MonitorList.vue
@@ -19,15 +19,12 @@
                 {{ $t("No Monitors, please") }} <router-link to="/add">{{ $t("add one") }}</router-link>
             </div>
 
-            <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }">
+            <router-link v-for="(item, index) in sortedMonitorList" :key="index" :to="monitorURL(item.id)" class="item" :class="{ 'disabled': ! item.active }" :title="item.description">
                 <div class="row">
                     <div class="col-9 col-md-8 small-padding" :class="{ 'monitor-item': $root.userHeartbeatBar == 'bottom' || $root.userHeartbeatBar == 'none' }">
                         <div class="info">
                             <Uptime :monitor="item" type="24" :pill="true" />
                             {{ item.name }}
-                            <span v-if="item.description" :title="item.description">
-                                <font-awesome-icon icon="info-circle" />
-                            </span>
                         </div>
                         <div class="tags">
                             <Tag v-for="tag in item.tags" :key="tag" :item="tag" :size="'sm'" />
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index f13060c25..fa1935b0c 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -89,12 +89,6 @@
                                 <input id="name" v-model="monitor.name" type="text" class="form-control" required>
                             </div>
 
-                            <!-- Description -->
-                            <div class="my-3">
-                                <label for="description" class="form-label">{{ $t("Description") }}</label>
-                                <input id="description" v-model="monitor.description" type="text" class="form-control">
-                            </div>
-
                             <!-- URL -->
                             <div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'browser' " class="my-3">
                                 <label for="url" class="form-label">{{ $t("URL") }}</label>
@@ -420,6 +414,12 @@
                                 </div>
                             </template>
 
+                            <!-- Description -->
+                            <div class="my-3">
+                                <label for="description" class="form-label">{{ $t("Description") }}</label>
+                                <input id="description" v-model="monitor.description" type="text" class="form-control">
+                            </div>
+
                             <div class="my-3">
                                 <tags-manager ref="tagsManager" :pre-selected-tags="monitor.tags"></tags-manager>
                             </div>