diff --git a/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java b/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java
index 1d28ce25..26c5dfb0 100644
--- a/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java
+++ b/src/main/java/com/replaymod/replay/camera/ClassicCameraController.java
@@ -10,8 +10,8 @@ import static net.minecraft.util.math.MathHelper.sin;
 // TODO: Marius is responsible for this. Please, someone clean it up.
 public class ClassicCameraController implements CameraController {
     private static final double LOWER_SPEED = 0.2;
-    private static final double UPPER_SPEED = 20;
-    private static final double SPEED_CHANGE = (UPPER_SPEED - LOWER_SPEED) / 2000;
+    private static final double UPPER_SPEED = 200;
+    private static final double SPEED_CHANGE = (UPPER_SPEED - LOWER_SPEED) / 20000;
 
     private final CameraEntity camera;
 
diff --git a/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java b/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java
index 10354be0..6561436b 100644
--- a/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java
+++ b/src/main/java/com/replaymod/replay/camera/VanillaCameraController.java
@@ -9,7 +9,7 @@ import net.minecraft.client.options.KeyBinding;
  * Camera controller performing vanilla creative-like camera movements.
  */
 public class VanillaCameraController implements CameraController {
-    private static final int MAX_SPEED = 1000;
+    private static final int MAX_SPEED = 2000;
     private static final int MIN_SPEED = -1000;
 
     private static final Vector3f[] DIRECTIONS = new Vector3f[]{