diff --git a/src/bot/registries/text.ts b/src/bot/registries/text.ts
index 67beb6dec7c..8d85ab90697 100644
--- a/src/bot/registries/text.ts
+++ b/src/bot/registries/text.ts
@@ -43,16 +43,12 @@ class Text extends Registry {
     });
     publicEndpoint(this.nsp, 'generic::getOne', async (opts: { id: any; parseText: boolean }, callback) => {
       try {
-        const item = await getRepository(TextEntity).findOne({ id: opts.id });
-        let text = '';
-        if (item) {
-          text = item.text;
-          if (opts.parseText) {
-            text = await new Message(await customvariables.executeVariablesInText(text)).parse();
-          }
-          callback(null, {...item, text});
+        const item = await getRepository(TextEntity).findOneOrFail({ id: opts.id });
+        let text = item.text;
+        if (opts.parseText) {
+          text = await new Message(await customvariables.executeVariablesInText(text)).parse();
         }
-        callback(null, null);
+        callback(null, {...item, text});
       } catch(e) {
         callback(e, null);
       }
diff --git a/src/panel/views/registries/text-overlay/text-overlay-edit.vue b/src/panel/views/registries/text-overlay/text-overlay-edit.vue
index 9a1e996b041..aeb86cbe5aa 100644
--- a/src/panel/views/registries/text-overlay/text-overlay-edit.vue
+++ b/src/panel/views/registries/text-overlay/text-overlay-edit.vue
@@ -200,8 +200,13 @@ export default class textOverlayEdit extends Vue {
     // load up from db
     if (this.$route.params.id) {
       this.id = this.$route.params.id
-      this.socket.emit('generic::getOne', { id: this.urlParam('id'), parseText: false }, (err: string | null, data: TextInterface) => {
+      this.socket.emit('generic::getOne', { id: this.$route.params.id, parseText: false }, (err: null | Error, data: TextInterface) => {
         if (err) {
+          this.$bvToast.toast(err.message, {
+            title: `Error`,
+            variant: 'danger',
+            solid: true,
+          });
           return console.error(err);
         }
         this.name = data.name