diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index 7555fa2682..e9bbd97f40 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -137,7 +137,7 @@ switch (toLower _mode) do {
         if (GVAR(ctrlKey)) then {
             GVAR(camZoom) = ((GVAR(camZoom) + _zChange * 0.1) max 0.01) min 2;
         } else {
-            GVAR(camSpeed) = (GVAR(camSpeed) + _zChange * 0.2) max 0.05;
+            GVAR(camSpeed) = ((GVAR(camSpeed) + _zChange * 0.2) max 0.05) min 10;
         };
     };
     case "onmousemoving": {
diff --git a/addons/spectator/functions/fnc_handleMouse.sqf b/addons/spectator/functions/fnc_handleMouse.sqf
index fe690b090e..8158ba95b5 100644
--- a/addons/spectator/functions/fnc_handleMouse.sqf
+++ b/addons/spectator/functions/fnc_handleMouse.sqf
@@ -31,8 +31,8 @@ _deltaX = _oldX - _x;
 _deltaY = _oldY - _y;
 
 if (_leftButton) then {
-    GVAR(camDolly) set [0, _deltaX * -10 * GVAR(camSpeed)];
-    GVAR(camDolly) set [1, _deltaY * 10 * GVAR(camSpeed)];
+    GVAR(camDolly) set [0, _deltaX * -100 * GVAR(camSpeed)];
+    GVAR(camDolly) set [1, _deltaY * 100 * GVAR(camSpeed)];
 } else {
     if (_rightButton) then {
         GVAR(camPan) = GVAR(camPan) - (_deltaX * 360);
diff --git a/addons/spectator/functions/fnc_setCameraAttributes.sqf b/addons/spectator/functions/fnc_setCameraAttributes.sqf
index 383f1a8723..c67ee086f3 100644
--- a/addons/spectator/functions/fnc_setCameraAttributes.sqf
+++ b/addons/spectator/functions/fnc_setCameraAttributes.sqf
@@ -52,8 +52,8 @@ if !(_vision in GVAR(availableVisions)) then {
 
 GVAR(camPan) = ((_heading % 360) max 0);
 GVAR(camPosition) = (ATLtoASL _position);
-GVAR(camSpeed) = _speed;
-GVAR(camTilt) = ((_heading min -90) max 90);
+GVAR(camSpeed) = (_speed min 0.05) max 10;
+GVAR(camTilt) = (_heading min -89) max 89;
 GVAR(camUnit) = _unit;
 GVAR(camVision) = _vision;
 GVAR(camZoom) = (_zoom min 2) max 0;