diff --git a/src/components/map/LayerStack.tsx b/src/components/map/LayerStack.tsx
index 189e58f..2cb040b 100644
--- a/src/components/map/LayerStack.tsx
+++ b/src/components/map/LayerStack.tsx
@@ -4,9 +4,10 @@ import react, {
   ReactComponentElement,
   ReactElement,
   ReactNode,
+  useRef,
 } from 'react';
 
-import { TileKeyObject } from './types';
+import { Rectangle, TileKeyObject } from './types';
 
 import { CoordinateSystem } from './LiveMap';
 import { range } from 'lodash';
@@ -14,6 +15,7 @@ import tileUri from './uris';
 import TiledLayer from './TiledLayer';
 import { ReactComponentOrElement } from '@ionic/react';
 import { KeyObject } from 'crypto';
+import useViewport from './use-viewport';
 
 export interface LayerStackProperties {
   /**
@@ -53,13 +55,20 @@ export const LayerStack: react.FC<LayerStackProperties> = (
       props.coordinateSystem
     )}, slippyGraphics: ${props.slippyGraphics}`
   );
+  const g = useRef<SVGGElement>(null);
+
+  const viewPort = useViewport({
+    coordinateSystem: props.coordinateSystem,
+    keyObject: props.keyObject,
+    svgElement: g,
+  });
 
   const numberOfTiledLayers =
     props.numberOfTiledLayers === undefined ? 1 : props.numberOfTiledLayers;
 
   const activeTiledLayer = Math.floor(numberOfTiledLayers / 2);
 
-  const getTiledLayer = (i: number) => {
+  const getTiledLayer = (i: number, viewPort?: Rectangle) => {
     const relativeZoomLevel = i - activeTiledLayer;
     const zoom = 2 ** relativeZoomLevel;
     const origin = {
@@ -88,6 +97,7 @@ export const LayerStack: react.FC<LayerStackProperties> = (
         shift={shift}
         zoom={256 / zoom}
         coordinateSystem={props.coordinateSystem}
+        viewPort={viewPort}
       />
     );
   };
@@ -99,6 +109,7 @@ export const LayerStack: react.FC<LayerStackProperties> = (
       <g
         transform={`translate(${props.coordinateSystem.shift.x}, ${props.coordinateSystem.shift.y}) scale(${props.coordinateSystem.zoom})`}
         key='tiles'
+        ref={g}
       >
         {
           // Tiled layers with less detail
@@ -112,7 +123,7 @@ export const LayerStack: react.FC<LayerStackProperties> = (
         }
         {
           // And the active one
-          getTiledLayer(activeTiledLayer)
+          getTiledLayer(activeTiledLayer, viewPort)
         }
         {/* {props.slippyGraphics !== undefined ? (
           // Slippy graphics (if needed)
diff --git a/src/components/map/TiledLayer.tsx b/src/components/map/TiledLayer.tsx
index fba0504..866b146 100644
--- a/src/components/map/TiledLayer.tsx
+++ b/src/components/map/TiledLayer.tsx
@@ -28,6 +28,10 @@ export interface TiledLayerProperties {
    * The coordinate system
    */
   coordinateSystem: CoordinateSystem;
+  /**
+   *
+   */
+  viewPort?: Rectangle;
 }
 
 /**
@@ -40,20 +44,15 @@ export interface TiledLayerProperties {
 export const TiledLayer: react.FC<TiledLayerProperties> = (
   props: TiledLayerProperties
 ) => {
-  const g = useRef<SVGGElement>(null);
-
-  const viewPort = useViewport({ ...props, svgElement: g });
-
   console.log(
     `Rendering TiledLayer, zoom: ${props.zoom}, viewPort: ${JSON.stringify(
-      viewPort
+      props.viewPort
     )}`
   );
   return (
     <>
       <g
         transform={`scale(${props.zoom}) translate(${props.shift.x}, ${props.shift.y})`}
-        ref={g}
       >
         <TileSet
           keyObject={{
@@ -62,7 +61,7 @@ export const TiledLayer: react.FC<TiledLayerProperties> = (
             x: 0,
             y: 0,
           }}
-          viewPort={viewPort}
+          viewPort={props.viewPort}
         />
       </g>
     </>
diff --git a/src/components/map/use-viewport.ts b/src/components/map/use-viewport.ts
index 789df70..375ed15 100644
--- a/src/components/map/use-viewport.ts
+++ b/src/components/map/use-viewport.ts
@@ -5,17 +5,12 @@ import { Rectangle, TileKeyObject } from './types';
 const useViewport = (props: {
   keyObject: TileKeyObject;
   coordinateSystem: CoordinateSystem;
-  zoom: number;
   svgElement: RefObject<SVGGElement>;
 }) => {
-  const { keyObject, coordinateSystem, zoom, svgElement } = props;
+  const { keyObject, coordinateSystem, svgElement } = props;
   const [viewPort, setViewPort] = useState<Rectangle>();
   useEffect(() => {
-    console.log(
-      `TiledLayer zoom: ${zoom}, useEffect, g.current: ${svgElement.current}`
-    );
     if (
-      zoom === 256 &&
       svgElement.current !== null &&
       svgElement.current.ownerSVGElement !== null &&
       svgElement.current.ownerSVGElement.parentElement !== null
@@ -50,7 +45,7 @@ const useViewport = (props: {
         },
       });
     }
-  }, [props.keyObject, props.coordinateSystem, props.zoom]);
+  }, [props.keyObject, props.coordinateSystem]);
   return viewPort;
 };
 export default useViewport;