diff --git a/device/libcamera/options.cc b/device/libcamera/options.cc
index 7420c61..d31060a 100644
--- a/device/libcamera/options.cc
+++ b/device/libcamera/options.cc
@@ -50,10 +50,14 @@ static std::map<unsigned, libcamera_control_id_t> libcamera_control_ids =
   LIBCAMERA_CONTROL(AfSpeed, "AfSpeed"),
   LIBCAMERA_CONTROL(AfTrigger, "AfTrigger"),
   LIBCAMERA_CONTROL(AfState, "AfState"),
+#if LIBCAMERA_VERSION_MAJOR == 0 && LIBCAMERA_VERSION_MINOR >= 5 // Support for older libcamera versions
+  LIBCAMERA_CONTROL(AeState, "AeState"),
+#else
+  LIBCAMERA_DRAFT_CONTROL(AeState),
+#endif
   LIBCAMERA_DRAFT_CONTROL(AePrecaptureTrigger),
   LIBCAMERA_DRAFT_CONTROL(NoiseReductionMode),
   LIBCAMERA_DRAFT_CONTROL(ColorCorrectionAberrationMode),
-  LIBCAMERA_DRAFT_CONTROL(AeState),
   LIBCAMERA_DRAFT_CONTROL(AwbState),
   LIBCAMERA_DRAFT_CONTROL(LensShadingMapMode),
 #if LIBCAMERA_VERSION_MAJOR == 0 && LIBCAMERA_VERSION_MINOR < 1 // Support RasPI bullseye