diff --git a/photon-client/src/store/index.js b/photon-client/src/store/index.js
index 2f09ef3f9..a694dfbe8 100644
--- a/photon-client/src/store/index.js
+++ b/photon-client/src/store/index.js
@@ -119,7 +119,7 @@ export default new Vuex.Store({
         calibrationData: {
             count: 0,
             videoModeIndex: 0,
-            minCount: 25,
+            minCount: 12, // Gets set by backend anyways, but we need a sane default
             hasEnough: false,
             squareSizeIn: 1.0,
             patternWidth: 8,
diff --git a/photon-server/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java b/photon-server/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java
index 6dfc22357..8abb47ee6 100644
--- a/photon-server/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java
+++ b/photon-server/src/main/java/org/photonvision/vision/pipeline/Calibrate3dPipeline.java
@@ -74,7 +74,7 @@ public class Calibrate3dPipeline
     private final Path imageDir = ConfigManager.getInstance().getCalibDir();
 
     public Calibrate3dPipeline() {
-        this(25);
+        this(12);
     }
 
     public Calibrate3dPipeline(int minSnapshots) {