diff --git a/src/bootstrap.tsx b/src/bootstrap.tsx
index 5ad6719f6..71cb1b78a 100644
--- a/src/bootstrap.tsx
+++ b/src/bootstrap.tsx
@@ -64,7 +64,7 @@ import Application, {
 } from '@terrestris/shogun-util/dist/model/Application';
 import User from '@terrestris/shogun-util/dist/model/User';
 import SHOGunApplicationUtil from '@terrestris/shogun-util/dist/parser/SHOGunApplicationUtil';
-import SHOGunAPIClient from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
+import { SHOGunAPIClient } from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
 
 const App = React.lazy(() => import('./App'));
 
diff --git a/src/components/ToolMenu/LayerTree/index.tsx b/src/components/ToolMenu/LayerTree/index.tsx
index 4ccd2e37d..cf886ad47 100644
--- a/src/components/ToolMenu/LayerTree/index.tsx
+++ b/src/components/ToolMenu/LayerTree/index.tsx
@@ -32,7 +32,7 @@ import {
   useMap
 } from '@terrestris/react-util/dist/Hooks/useMap/useMap';
 
-import LayerType from '@terrestris/shogun-util/dist/model/enum/LayerType';
+import type { LayerType } from '@terrestris/shogun-util/dist/model/enum/LayerType';
 import {
   getBearerTokenHeader
 } from '@terrestris/shogun-util/dist/security/getBearerTokenHeader';
diff --git a/src/components/UserMenu/index.tsx b/src/components/UserMenu/index.tsx
index d105673b5..e22d27aee 100644
--- a/src/components/UserMenu/index.tsx
+++ b/src/components/UserMenu/index.tsx
@@ -55,7 +55,7 @@ export const UserMenu: React.FC = (): JSX.Element => {
 
   useEffect(() => {
     const getLoginUrl = async () => {
-      const url = await keycloak?.createLoginUrl()
+      const url = await keycloak?.createLoginUrl();
       setLoginUrl(url);
     };
 
diff --git a/src/context/SHOGunAPIClientContext.tsx b/src/context/SHOGunAPIClientContext.tsx
index 615bbb638..77e3a0664 100644
--- a/src/context/SHOGunAPIClientContext.tsx
+++ b/src/context/SHOGunAPIClientContext.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import SHOGunAPIClient from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
+import { SHOGunAPIClient } from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
 
 export type SHOGunAPIClientProviderProps = {
   client?: SHOGunAPIClient;
diff --git a/src/hooks/useSHOGunAPIClient.ts b/src/hooks/useSHOGunAPIClient.ts
index b098fa029..42a5c98ff 100644
--- a/src/hooks/useSHOGunAPIClient.ts
+++ b/src/hooks/useSHOGunAPIClient.ts
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 
-import SHOGunAPIClient from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
+import { SHOGunAPIClient } from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
 
 import SHOGunAPIClientContext from '../context/SHOGunAPIClientContext';
 
diff --git a/src/plugin/index.ts b/src/plugin/index.ts
index 11b417178..554a541e4 100644
--- a/src/plugin/index.ts
+++ b/src/plugin/index.ts
@@ -8,7 +8,7 @@ import type {
 import { CollapsePanelProps } from 'antd';
 import type OlMap from 'ol/Map';
 
-import type SHOGunAPIClient from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
+import { SHOGunAPIClient } from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
 
 export type ClientPluginLocale = Record<string, {
     translation: Record<string, any>;