diff --git a/package-lock.json b/package-lock.json
index 7b7b522b3b..3d5b9b0f08 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27775,6 +27775,7 @@
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
       "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -32360,9 +32361,9 @@
       }
     },
     "@terrestris/ol-util": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@terrestris/ol-util/-/ol-util-5.1.0.tgz",
-      "integrity": "sha512-IDmqh0H47uSmtZWAWYzILW1Vi4CUvUKgIhL5Vj3OgQ+mYA4k9vL3QvisRWxun3cH6Ra1fgTDy+39i7AT953QdA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@terrestris/ol-util/-/ol-util-6.0.0.tgz",
+      "integrity": "sha512-99km/hVLd0JS6y7zCNnD1Bf9IW2lpiUWfKcawvhkyVkEujsSP4zlgl6QwCiYgWQYUsoCAyNZHeiFVoXklEwW+A==",
       "requires": {
         "@terrestris/base-util": "^1.0.1",
         "@turf/turf": "^6.5.0",
@@ -32371,6 +32372,13 @@
         "proj4": "^2.7.5",
         "shpjs": "^4.0.2",
         "typescript": "^4.5.5"
+      },
+      "dependencies": {
+        "typescript": {
+          "version": "4.6.2",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
+          "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="
+        }
       }
     },
     "@testing-library/dom": {
@@ -50768,7 +50776,8 @@
     "typescript": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
-      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="
+      "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
+      "dev": true
     },
     "uglify-js": {
       "version": "3.15.2",
diff --git a/src/Button/DigitizeButton/DigitizeButton.tsx b/src/Button/DigitizeButton/DigitizeButton.tsx
index 5ef4fef0b6..cc41b968c6 100644
--- a/src/Button/DigitizeButton/DigitizeButton.tsx
+++ b/src/Button/DigitizeButton/DigitizeButton.tsx
@@ -526,9 +526,9 @@ class DigitizeButton extends React.Component<DigitizeButtonProps, DigitizeButton
       map
     } = this.props;
 
-    let digitizeLayer = digitizeLayerName ? MapUtil.getLayerByName(map, digitizeLayerName) : null;
+    let digitizeLayer = digitizeLayerName ? MapUtil.getLayerByName(map, digitizeLayerName) as OlLayerVector<OlSourceVector<OlGeometry>>: null;
 
-    if (!digitizeLayer) {
+    if (digitizeLayer == null) {
       digitizeLayer = new OlLayerVector({
         source: new OlSourceVector({
           features: new OlCollection()
@@ -544,7 +544,7 @@ class DigitizeButton extends React.Component<DigitizeButtonProps, DigitizeButton
 
     this._digitizeLayer = digitizeLayer;
 
-    this._digitizeFeatures = digitizeLayer.getSource().getFeaturesCollection();
+    this._digitizeFeatures = digitizeLayer.getSource()?.getFeaturesCollection() ?? null;
   };
 
   /**
diff --git a/src/Button/MeasureButton/MeasureButton.tsx b/src/Button/MeasureButton/MeasureButton.tsx
index 4b1a9e2b71..26f557edb0 100644
--- a/src/Button/MeasureButton/MeasureButton.tsx
+++ b/src/Button/MeasureButton/MeasureButton.tsx
@@ -335,7 +335,7 @@ class MeasureButton extends React.Component<MeasureButtonProps> {
       map
     } = this.props;
 
-    let measureLayer = MapUtil.getLayerByName(map, measureLayerName);
+    let measureLayer = MapUtil.getLayerByName(map, measureLayerName) as OlLayerVector<OlSourceVector<OlGeometry>>;
 
     if (!measureLayer) {
       measureLayer = new OlLayerVector({
diff --git a/src/Legend/Legend.tsx b/src/Legend/Legend.tsx
index d36481e0e0..29f21ed911 100644
--- a/src/Legend/Legend.tsx
+++ b/src/Legend/Legend.tsx
@@ -4,9 +4,9 @@ import _isEqual from 'lodash/isEqual';
 
 import Logger from '@terrestris/base-util/dist/Logger';
 import MapUtil from '@terrestris/ol-util/dist/MapUtil/MapUtil';
-import OlBaseLayer from 'ol/layer/Base';
 
 import { CSS_PREFIX } from '../constants';
+import { WmsLayer } from '../Util/typeUtils';
 
 export interface BaseProps {
   /**
@@ -16,7 +16,7 @@ export interface BaseProps {
   /**
    * The layer you want to display the legend of.
    */
-  layer: OlBaseLayer;
+  layer: WmsLayer;
   /**
    * An object containing additional request params like "{HEIGHT: 400}" will
    * be transformed to "&HEIGHT=400" an added to the GetLegendGraphic request.
@@ -105,7 +105,7 @@ export class Legend extends React.Component<LegendProps, LegendState> {
    * @param layer The layer to get the legend graphic request for.
    * @param extraParams The extra params.
    */
-  getLegendUrl(layer: OlBaseLayer, extraParams: any) {
+  getLegendUrl(layer: WmsLayer, extraParams: any) {
     let legendUrl;
 
     if (layer.get('legendUrl')) {
diff --git a/src/Util/DigitizeUtil.ts b/src/Util/DigitizeUtil.ts
index dce0f1e9d4..1c3b9b2cd7 100644
--- a/src/Util/DigitizeUtil.ts
+++ b/src/Util/DigitizeUtil.ts
@@ -95,7 +95,7 @@ export class DigitizeUtil {
    * @param map
    */
   static getDigitizeLayer(map: OlMap): OlVectorLayer<OlSourceVector<Geometry>> {
-    let digitizeLayer = MapUtil.getLayerByName(map, DigitizeUtil.DIGITIZE_LAYER_NAME);
+    let digitizeLayer = MapUtil.getLayerByName(map, DigitizeUtil.DIGITIZE_LAYER_NAME) as OlVectorLayer<OlSourceVector>;
 
     if (!digitizeLayer) {
       digitizeLayer = new OlLayerVector({
diff --git a/src/Util/typeUtils.ts b/src/Util/typeUtils.ts
index 61485994ae..5f73c7b9cd 100644
--- a/src/Util/typeUtils.ts
+++ b/src/Util/typeUtils.ts
@@ -5,7 +5,7 @@ import OlTileWMS from 'ol/source/TileWMS';
 import OlImageLayer from 'ol/layer/Image';
 import OlTileLayer from 'ol/layer/Tile';
 
-export type WmsLayer = OlImageLayer<OlImageWMS> | OlTileLayer<OlTileWMS>;
+export type WmsLayer = OlImageLayer<OlImageWMS> | OlTileLayer<OlTileWMS> | OlLayer<OlImageWMS | OlTileWMS>;
 
 export function isWmsLayer(layer: OlBaseLayer): layer is OlLayer<OlImageWMS | OlTileWMS, any> {
   if (layer instanceof OlLayer) {