diff --git a/apps/files_sharing/src/collaborationresources.js b/apps/files_sharing/src/collaborationresources.js
index d95f367637..27f268be85 100644
--- a/apps/files_sharing/src/collaborationresources.js
+++ b/apps/files_sharing/src/collaborationresources.js
@@ -22,14 +22,14 @@
 
 import Vue from 'vue';
 import Vuex from 'vuex';
-import { PopoverMenu } from 'nextcloud-vue';
+import { Tooltip, PopoverMenu } from 'nextcloud-vue';
 import ClickOutside from 'vue-click-outside';
-import { VTooltip } from 'v-tooltip';
 
 Vue.prototype.t = t;
 Vue.component('PopoverMenu', PopoverMenu);
 Vue.directive('ClickOutside', ClickOutside);
-Vue.directive('Tooltip', VTooltip);
+Tooltip.options.defaultHtml = false
+Vue.directive('Tooltip', Tooltip);
 Vue.use(Vuex);
 
 import View from './views/CollaborationView';
diff --git a/apps/updatenotification/src/components/root.vue b/apps/updatenotification/src/components/root.vue
index 54fc54cd2c..0f6a427bb3 100644
--- a/apps/updatenotification/src/components/root.vue
+++ b/apps/updatenotification/src/components/root.vue
@@ -96,6 +96,8 @@
 	import { VTooltip } from 'v-tooltip';
 	import ClickOutside from 'vue-click-outside';
 
+	VTooltip.options.defaultHtml = false
+
 	export default {
 		name: 'root',
 		components: {
diff --git a/settings/src/main-apps-users-management.js b/settings/src/main-apps-users-management.js
index a23887458c..a8627c2277 100644
--- a/settings/src/main-apps-users-management.js
+++ b/settings/src/main-apps-users-management.js
@@ -28,7 +28,7 @@ import App from './App.vue';
 import router from './router';
 import store from './store';
 
-Vue.use(VTooltip);
+Vue.use(VTooltip, { defaultHtml: false });
 
 sync(store, router);
 
@@ -54,4 +54,4 @@ const app = new Vue({
 	render: h => h(App)
 }).$mount('#content');
 
-export { app, router, store };
\ No newline at end of file
+export { app, router, store };
diff --git a/settings/src/main-personal-security.js b/settings/src/main-personal-security.js
index aaddd0a333..799b15952e 100644
--- a/settings/src/main-personal-security.js
+++ b/settings/src/main-personal-security.js
@@ -28,7 +28,7 @@ import AuthTokenSection from './components/AuthTokenSection';
 __webpack_nonce__ = btoa(OC.requestToken);
 
 Vue.use(VueClipboard);
-Vue.use(VTooltip);
+Vue.use(VTooltip, { defaultHtml: false });
 Vue.prototype.t = t;
 
 const View = Vue.extend(AuthTokenSection);