diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index d43db3600b20..d559f0fc4b81 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -602,8 +602,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 		if (infoMap != controlsInfo.end()) {
 			for (const auto &value : infoMap->second.values())
 				data.push_back(value.get<int32_t>());
+			data.resize(infoMap->second.values().size());
 		} else {
 			data.push_back(ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF);
+			data.resize(1);
 		}
 		staticMetadata_->addEntry(ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,
 					  data.data(), data.size());
@@ -803,8 +805,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 		if (infoMap != controlsInfo.end()) {
 			for (const auto &value : infoMap->second.values())
 				data.push_back(value.get<int32_t>());
+			data.resize(infoMap->second.values().size());
 		} else {
 			data.push_back(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF);
+			data.resize(1);
 		}
 		staticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,
 					  data.data(), data.size());
@@ -871,8 +875,10 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
 		if (infoMap != controlsInfo.end()) {
 			for (const auto &value : infoMap->second.values())
 				data.push_back(value.get<int32_t>());
+			data.resize(infoMap->second.values().size());
 		} else {
 			data.push_back(ANDROID_NOISE_REDUCTION_MODE_OFF);
+			data.resize(1);
 		}
 		staticMetadata_->addEntry(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,
 					  data.data(), data.size());