diff --git a/chameleon-client/src/components/OutputTab/SingleCalibration.vue b/chameleon-client/src/components/OutputTab/SingleCalibration.vue
index eaed4c846..9db8687df 100644
--- a/chameleon-client/src/components/OutputTab/SingleCalibration.vue
+++ b/chameleon-client/src/components/OutputTab/SingleCalibration.vue
@@ -17,7 +17,7 @@
         props: ['rawPoint'],
         methods: {
             clearPoint() {
-                this.handleInput('point', [0, 0]);
+                this.handleInput('point', []);
                 this.$emit('update');
             },
             takePoint() {
diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
index c577c9a19..3d30f7d72 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
@@ -47,6 +47,11 @@ public class Collect2dTargetsPipe implements Pipe<Pair<List<RotatedRect>, Captur
                 t.rawPoint = r;
                 switch (this.calibrationMode) {
                     case Single:
+                        if(this.calibrationPoint.isEmpty())
+                        {
+                            this.calibrationPoint.add(camProps.centerX);
+                            this.calibrationPoint.add(camProps.centerY);
+                        }
                         t.calibratedX = this.calibrationPoint.get(0).doubleValue();
                         t.calibratedY = this.calibrationPoint.get(1).doubleValue();
                         break;
diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
index 367799717..d0834420a 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
@@ -49,6 +49,11 @@ public class Draw2dCrosshairPipe implements Pipe<Pair<Mat, List<CVPipeline2d.Tar
             y = image.rows() / 2;
             switch (this.calibrationMode) {
                 case Single:
+                    if(this.calibrationPoint.isEmpty())
+                    {
+                        this.calibrationPoint.add(x);
+                        this.calibrationPoint.add(y);
+                    }
                     x = this.calibrationPoint.get(0).intValue();
                     y = this.calibrationPoint.get(1).intValue();
                     break;