diff --git a/photon-core/src/main/java/org/photonvision/vision/camera/csi/LibcameraGpuSettables.java b/photon-core/src/main/java/org/photonvision/vision/camera/csi/LibcameraGpuSettables.java
index 4b7c30698..da8448847 100644
--- a/photon-core/src/main/java/org/photonvision/vision/camera/csi/LibcameraGpuSettables.java
+++ b/photon-core/src/main/java/org/photonvision/vision/camera/csi/LibcameraGpuSettables.java
@@ -124,16 +124,19 @@ public class LibcameraGpuSettables extends VisionSourceSettables {
 
     @Override
     public void setAutoExposure(boolean cameraAutoExposure) {
+        logger.debug("Setting auto exposure to " + cameraAutoExposure);
         lastAutoExposureActive = cameraAutoExposure;
         LibCameraJNI.setAutoExposure(r_ptr, cameraAutoExposure);
+        if (!cameraAutoExposure) {
+            setExposureRaw(lastManualExposure);
+        }
     }
 
     @Override
     public void setExposureRaw(double exposureRaw) {
-        if (exposureRaw < 0.0 || lastAutoExposureActive) {
-            // Auto-exposure is active right now, don't set anything.
-            return;
-        }
+        logger.debug("Setting exposure to " + exposureRaw);
+
+        LibCameraJNI.setAutoExposure(r_ptr, false);
 
         // Store the exposure for use when we need to recreate the camera.
         lastManualExposure = exposureRaw;