diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 205486108..23ec784ba 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -226,8 +226,8 @@ import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterOffIcon from 'vue-material-design-icons/FilterOff.vue'
 import ArrowCollapseVerticalIcon from 'vue-material-design-icons/ArrowCollapseVertical.vue'
 import ArrowExpandVerticalIcon from 'vue-material-design-icons/ArrowExpandVertical.vue'
-import SessionList from './SessionList'
-import { isNotifyPushEnabled } from '../sessions'
+import SessionList from './SessionList.vue'
+import { isNotifyPushEnabled } from '../sessions.js'
 
 export default {
 	name: 'Controls',
diff --git a/src/components/SessionList.vue b/src/components/SessionList.vue
index ebd3c90ab..c40853aaf 100644
--- a/src/components/SessionList.vue
+++ b/src/components/SessionList.vue
@@ -39,8 +39,7 @@
 </template>
 
 <script>
-import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import Avatar from '@nextcloud/vue/dist/Components/Avatar'
+import { Avatar, Tooltip } from '@nextcloud/vue'
 
 export default {
 	name: 'SessionList',
diff --git a/src/sessions.js b/src/sessions.js
index 48ee2ea89..b5a2f96f6 100644
--- a/src/sessions.js
+++ b/src/sessions.js
@@ -19,8 +19,8 @@
  */
 
 import { listen } from '@nextcloud/notify_push'
-import { sessionApi } from './services/SessionApi'
-import store from './store/main'
+import { sessionApi } from './services/SessionApi.js'
+import store from './store/main.js'
 
 const SESSION_INTERVAL = 90 // in seconds