diff --git a/src/client/app/common/scripts/note-mixin.ts b/src/client/app/common/scripts/note-mixin.ts
index e0df788b34..205c6dc02b 100644
--- a/src/client/app/common/scripts/note-mixin.ts
+++ b/src/client/app/common/scripts/note-mixin.ts
@@ -79,8 +79,8 @@ export default (opts: Opts = {}) => ({
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue
index 966bd54170..758ce2c273 100644
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -51,8 +51,8 @@ export default Vue.extend({
 			if (this.message.text) {
 				const ast = parse(this.message.text);
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index 37c4093355..877577edcd 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -151,8 +151,8 @@ export default Vue.extend({
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 61968a64d1..19455aeae2 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -143,8 +143,8 @@ export default Vue.extend({
 			if (this.appearNote.text) {
 				const ast = parse(this.appearNote.text);
 				return unique(ast
-					.filter(t => (t.type == 'url' || t.type == 'link') && !t.silent)
-					.map(t => t.url));
+					.filter(t => ((t.name == 'url' || t.name == 'link') && t.props.url && !t.silent))
+					.map(t => t.props.url));
 			} else {
 				return null;
 			}