diff --git a/package-lock.json b/package-lock.json
index 01912da4..7cae5efa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,6 @@
 				"p-queue": "^6.6.2",
 				"uuid": "^8.3.2",
 				"v-click-outside": "^3.1.2",
-				"v-tooltip": "^2.1.3",
 				"vue": "^2.6.14",
 				"vue-clipboard2": "^0.3.3",
 				"vue-material-design-icons": "^5.0.0",
diff --git a/package.json b/package.json
index 5ee240d6..bbee2a70 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,6 @@
 		"p-queue": "^6.6.2",
 		"uuid": "^8.3.2",
 		"v-click-outside": "^3.1.2",
-		"v-tooltip": "^2.1.3",
 		"vue": "^2.6.14",
 		"vue-clipboard2": "^0.3.3",
 		"vue-material-design-icons": "^5.0.0",
diff --git a/src/components/AppNavigation/ListItemCalendar.vue b/src/components/AppNavigation/ListItemCalendar.vue
index c9af6089..7c30d782 100644
--- a/src/components/AppNavigation/ListItemCalendar.vue
+++ b/src/components/AppNavigation/ListItemCalendar.vue
@@ -150,6 +150,7 @@ import AppNavigationIconBullet from '@nextcloud/vue/dist/Components/AppNavigatio
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 
 import Close from 'vue-material-design-icons/Close'
 import Delete from 'vue-material-design-icons/Delete'
@@ -185,6 +186,7 @@ export default {
 	},
 	directives: {
 		clickOutside: ClickOutside.directive,
+		Tooltip,
 	},
 	props: {
 		calendar: {
diff --git a/src/components/DeleteCompletedModal.vue b/src/components/DeleteCompletedModal.vue
index c82fb8a8..04f0a796 100644
--- a/src/components/DeleteCompletedModal.vue
+++ b/src/components/DeleteCompletedModal.vue
@@ -66,6 +66,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 <script>
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 
 import Delete from 'vue-material-design-icons/Delete'
 
@@ -76,6 +77,9 @@ export default {
 		Delete,
 		Modal,
 	},
+	directives: {
+		Tooltip,
+	},
 	props: {
 		calendar: {
 			type: Object,
diff --git a/src/components/SortorderDropdown.vue b/src/components/SortorderDropdown.vue
index 1e7444ec..962aca47 100644
--- a/src/components/SortorderDropdown.vue
+++ b/src/components/SortorderDropdown.vue
@@ -62,6 +62,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 import { translate as t } from '@nextcloud/l10n'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 
 import AnimationOutline from 'vue-material-design-icons/AnimationOutline'
 import Bookmark from 'vue-material-design-icons/Bookmark'
@@ -94,6 +95,9 @@ export default {
 		Plus,
 		Star,
 	},
+	directives: {
+		Tooltip,
+	},
 	data() {
 		return {
 			orders: [
diff --git a/src/main.js b/src/main.js
index 6533e86f..a031e1eb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,7 +42,6 @@ import TrendingUp from 'vue-material-design-icons/TrendingUp'
 import Vue from 'vue'
 import { sync } from 'vuex-router-sync'
 // eslint-disable-next-line import/no-named-as-default
-import VTooltip from 'v-tooltip'
 import VueClipboard from 'vue-clipboard2'
 
 // Disable on production
@@ -62,7 +61,6 @@ __webpack_public_path__ = linkTo('tasks', 'js/')
 
 sync(store, router)
 
-Vue.use(VTooltip)
 Vue.use(VueClipboard)
 
 /**
diff --git a/src/views/AppNavigation.vue b/src/views/AppNavigation.vue
index 4f39b437..a046bb7f 100644
--- a/src/views/AppNavigation.vue
+++ b/src/views/AppNavigation.vue
@@ -109,6 +109,7 @@ import { translate as t } from '@nextcloud/l10n'
 import AppNavigation from '@nextcloud/vue/dist/Components/AppNavigation'
 import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
 import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
+import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
 
 import CalendarToday from 'vue-material-design-icons/CalendarToday'
 import CalendarWeek from 'vue-material-design-icons/CalendarWeek'
@@ -142,6 +143,7 @@ export default {
 	},
 	directives: {
 		clickOutside: ClickOutside.directive,
+		Tooltip,
 	},
 	data() {
 		return {
diff --git a/tests/javascript/unit/views/AppContent/General.spec.js b/tests/javascript/unit/views/AppContent/General.spec.js
index 47f86614..e03bce32 100644
--- a/tests/javascript/unit/views/AppContent/General.spec.js
+++ b/tests/javascript/unit/views/AppContent/General.spec.js
@@ -4,10 +4,6 @@ import router from '@/router.js'
 import { store, localVue } from '../../setupStore.js'
 
 import { mount } from '@vue/test-utils'
-// eslint-disable-next-line import/no-named-as-default
-import VTooltip from 'v-tooltip'
-
-localVue.use(VTooltip)
 
 describe('General.vue', () => {
 	'use strict'
diff --git a/tests/javascript/unit/views/AppContent/Week.spec.js b/tests/javascript/unit/views/AppContent/Week.spec.js
index 1543f1f2..0317a5a9 100644
--- a/tests/javascript/unit/views/AppContent/Week.spec.js
+++ b/tests/javascript/unit/views/AppContent/Week.spec.js
@@ -4,10 +4,6 @@ import router from '@/router.js'
 import { store, localVue } from '../../setupStore.js'
 
 import { mount } from '@vue/test-utils'
-// eslint-disable-next-line import/no-named-as-default
-import VTooltip from 'v-tooltip'
-
-localVue.use(VTooltip)
 
 describe('Week.vue', () => {
 	'use strict'