diff --git a/src/map-renderer.ts b/src/map-renderer.ts
index 110dc31..ef7e28a 100644
--- a/src/map-renderer.ts
+++ b/src/map-renderer.ts
@@ -16,6 +16,8 @@ function easeCubic(t: number): number {
 
 type PropertyValue = string | number | boolean | string[] | null;
 
+export let currentViewState: MapViewState | null = null;
+
 interface MapProperty {
     name: string;
     value: PropertyValue;
@@ -708,6 +710,9 @@ export function createMapRenderer(config: MapRendererOptions): Deck<MapViewType[
 
             return layers;
         })(),
+        onViewStateChange: ({ viewState: newViewState }) => {
+            currentViewState = newViewState;
+        }
     });
 
     mapCanvas.addEventListener('contextmenu', (e: MouseEvent) => {
@@ -717,9 +722,8 @@ export function createMapRenderer(config: MapRendererOptions): Deck<MapViewType[
         const rect = mapCanvas.getBoundingClientRect();
         const x = e.clientX - rect.left;
         const y = e.clientY - rect.top;
-        
-        const viewState = deck.props.viewState?.MapView;
-        
+        const viewState = currentViewState;
+
         if (viewState) {
             const viewport = deck.getViewports()[0];
             const [lng, lat] = viewport?.unproject([x, y]) || [0, 0];
diff --git a/src/views/map-bases-view.ts b/src/views/map-bases-view.ts
index 5a30453..2228de1 100644
--- a/src/views/map-bases-view.ts
+++ b/src/views/map-bases-view.ts
@@ -14,6 +14,7 @@ import { MapView as MapViewType } from '@deck.gl/core';
 import { createMapRenderer, MapPoint, updateMapPoints } from '../map-renderer';
 import MapPlugin from '../main';
 import { haveLocationsChanged } from '../pointutils';
+import { currentViewState } from '../map-renderer';
 
 export const MapBasesViewType = 'map';
 
@@ -75,7 +76,7 @@ export class MapBasesView extends BasesView {
     private destroyMap(): void {
         if (this.deck) {
             try {
-                const viewState = this.deck.props.viewState?.MapView;
+                const viewState = currentViewState;
                 if (viewState) {
                     this.savedViewState = viewState;
                 }