diff --git a/demo/client/src/benchmark.ts b/demo/client/src/benchmark.ts
index 17a4c262..1e28636d 100644
--- a/demo/client/src/benchmark.ts
+++ b/demo/client/src/benchmark.ts
@@ -130,7 +130,7 @@ class BenchmarkTestView extends PathfinderDemoView {
 
         this.appController = appController;
 
-        this.camera = new OrthographicCamera(this.canvas, false);
+        this.camera = new OrthographicCamera(this.canvas);
         this.camera.onPan = () => this.setDirty();
         this.camera.onZoom = () => this.setDirty();
     }
diff --git a/demo/client/src/camera.ts b/demo/client/src/camera.ts
index 8bf837db..8507256e 100644
--- a/demo/client/src/camera.ts
+++ b/demo/client/src/camera.ts
@@ -18,7 +18,8 @@ const ORTHOGRAPHIC_ZOOM_SPEED: number = 1.0 / 100.0;
 const ORTHOGRAPHIC_ZOOM_IN_FACTOR: number = 1.2;
 const ORTHOGRAPHIC_ZOOM_OUT_FACTOR: number = 1.0 / ORTHOGRAPHIC_ZOOM_IN_FACTOR;
 
-const ORTHOGRAPHIC_MAX_SCALE: number = 10.0;
+const ORTHOGRAPHIC_DEFAULT_MIN_SCALE: number = 0.01;
+const ORTHOGRAPHIC_DEFAULT_MAX_SCALE: number = 1000.0;
 
 const PERSPECTIVE_MOVEMENT_SPEED: number = 10.0;
 const PERSPECTIVE_ROTATION_SPEED: number = 1.0 / 300.0;
@@ -52,10 +53,11 @@ export abstract class Camera {
 }
 
 export class OrthographicCamera extends Camera {
-    constructor(canvas: HTMLCanvasElement, limitedZoom: boolean) {
+    constructor(canvas: HTMLCanvasElement, minScale?: number, maxScale?: number) {
         super(canvas);
 
-        this.limitedZoom = limitedZoom;
+        this.minScale = _.defaultTo(minScale, ORTHOGRAPHIC_DEFAULT_MIN_SCALE);
+        this.maxScale = _.defaultTo(maxScale, ORTHOGRAPHIC_DEFAULT_MAX_SCALE);
 
         this.translation = glmatrix.vec2.create();
         this.scale = 1.0;
@@ -147,9 +149,7 @@ export class OrthographicCamera extends Camera {
         glmatrix.vec2.sub(absoluteTranslation, this.translation, point);
         glmatrix.vec2.scale(absoluteTranslation, absoluteTranslation, 1.0 / this.scale);
 
-        this.scale *= scale;
-        if (this.limitedZoom && this.scale > ORTHOGRAPHIC_MAX_SCALE)
-            this.scale = ORTHOGRAPHIC_MAX_SCALE;
+        this.scale = _.clamp(this.scale * scale, this.minScale, this.maxScale);
 
         glmatrix.vec2.scale(absoluteTranslation, absoluteTranslation, this.scale);
         glmatrix.vec2.add(this.translation, absoluteTranslation, point);
@@ -178,7 +178,8 @@ export class OrthographicCamera extends Camera {
     translation: glmatrix.vec2;
     scale: number;
 
-    private readonly limitedZoom: boolean;
+    private readonly minScale: number;
+    private readonly maxScale: number;
 }
 
 export class PerspectiveCamera extends Camera {
diff --git a/demo/client/src/mesh-debugger.ts b/demo/client/src/mesh-debugger.ts
index 4b3e4e4b..90e169cc 100644
--- a/demo/client/src/mesh-debugger.ts
+++ b/demo/client/src/mesh-debugger.ts
@@ -68,7 +68,7 @@ class MeshDebuggerView extends PathfinderView {
         super();
 
         this.appController = appController;
-        this.camera = new OrthographicCamera(this.canvas, false);
+        this.camera = new OrthographicCamera(this.canvas);
         this.scale = 1.0;
     }
 
diff --git a/demo/client/src/svg-demo.ts b/demo/client/src/svg-demo.ts
index d5d7bc1c..dcfc2ec4 100644
--- a/demo/client/src/svg-demo.ts
+++ b/demo/client/src/svg-demo.ts
@@ -213,7 +213,7 @@ class SVGDemoView extends PathfinderDemoView {
 
         this.appController = appController;
 
-        this.camera = new OrthographicCamera(this.canvas, false);
+        this.camera = new OrthographicCamera(this.canvas);
         this.camera.onPan = () => this.setDirty();
         this.camera.onZoom = () => this.setDirty();
     }
diff --git a/demo/client/src/text-demo.ts b/demo/client/src/text-demo.ts
index b9431b46..ac0a436f 100644
--- a/demo/client/src/text-demo.ts
+++ b/demo/client/src/text-demo.ts
@@ -76,6 +76,9 @@ const B_PATH_INDEX_SIZE: number = 2;
 
 const ATLAS_SIZE: glmatrix.vec2 = glmatrix.vec2.fromValues(2048, 4096);
 
+const MIN_SCALE: number = 0.02;
+const MAX_SCALE: number = 10.0;
+
 declare global {
     interface Window {
         jQuery(element: HTMLElement): JQuerySubset;
@@ -243,7 +246,7 @@ class TextDemoView extends MonochromePathfinderView {
 
         this.appController = appController;
 
-        this.camera = new OrthographicCamera(this.canvas, true);
+        this.camera = new OrthographicCamera(this.canvas, MIN_SCALE, MAX_SCALE);
         this.camera.onPan = () => this.onPan();
         this.camera.onZoom = () => this.onZoom();