diff --git a/src/public/app/services/note_tooltip.js b/src/public/app/services/note_tooltip.js
index 6cfa24572..c3c974c27 100644
--- a/src/public/app/services/note_tooltip.js
+++ b/src/public/app/services/note_tooltip.js
@@ -63,6 +63,7 @@ async function mouseEnterHandler() {
             placement: 'auto',
             trigger: 'manual',
             boundary: 'window',
+            offset: "0, 20", // workaround for https://github.com/zadam/trilium/issues/2794
             title: html,
             html: true,
             template: '<div class="tooltip note-tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 5fac6f97c..647373b6d 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -379,6 +379,10 @@ table.promoted-attributes-in-tooltip td, table.promoted-attributes-in-tooltip th
     font-size: var(--main-font-size) !important;
 }
 
+.tooltip .arrow {
+    display: none;
+}
+
 .tooltip-inner {
     padding: 15px;
     background-color: var(--tooltip-background-color) !important;
diff --git a/src/services/handlers.js b/src/services/handlers.js
index 8a8a0e072..eedfb9a34 100644
--- a/src/services/handlers.js
+++ b/src/services/handlers.js
@@ -6,6 +6,10 @@ const becca = require('../becca/becca');
 const Attribute = require('../becca/entities/attribute');
 
 function runAttachedRelations(note, relationName, originEntity) {
+    if (!note) {
+        return;
+    }
+
     // same script note can get here with multiple ways, but execute only once
     const notesToRun = new Set(
         note.getRelations(relationName)