diff --git a/libs/surfaces/websockets/mixer.cc b/libs/surfaces/websockets/mixer.cc
index c1c8ee9394..a39f860860 100644
--- a/libs/surfaces/websockets/mixer.cc
+++ b/libs/surfaces/websockets/mixer.cc
@@ -90,8 +90,7 @@ ArdourMixer::strip_pan (uint32_t strip_n) const
 		/* TODO: inform GUI that strip has no panner */
 		return 0;
 	}
-	/* scale from [0.0 ; 1.0] to [-1.0 ; 1.0] */
-	return 2.0 * ac->get_value () - 1.0; //TODO: prefer ac->internal_to_interface (c->get_value ());
+	return ac->internal_to_interface (ac->get_value ());
 }
 
 void
@@ -101,9 +100,7 @@ ArdourMixer::set_strip_pan (uint32_t strip_n, double value)
 	if (!ac) {
 		return;
 	}
-	/* TODO: prefer ac->set_value (ac->interface_to_internal (value), NoGroup); */
-	value = (value + 1.0) / 2.0;
-	ac->set_value (value, PBD::Controllable::NoGroup);
+	ac->set_value (ac->interface_to_internal (value), PBD::Controllable::NoGroup);
 }
 
 bool
diff --git a/share/web_surfaces/builtin/mixer/js/tkwidget.js b/share/web_surfaces/builtin/mixer/js/tkwidget.js
index 98365ab482..18e855caaf 100644
--- a/share/web_surfaces/builtin/mixer/js/tkwidget.js
+++ b/share/web_surfaces/builtin/mixer/js/tkwidget.js
@@ -170,14 +170,13 @@ export class DiscreteKnob extends Knob {
 
 }
 
-// TODO: consider switching to [0-1.0] pan scale in Ardour surface code
-
 export class PanKnob extends Knob {
 
     constructor () {
         super({
-            scale: 'linear',
-            min: -1.0,
+            //scale: 'linear',
+            scale: (k) => 1.0 - k,
+            min: 0,
             max: 1.0
         });
     }