diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index eb327978..f175ce53 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1554,6 +1554,11 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
 		running_ = false;
 	}
 
+	if (stream_list->num_streams == 0) {
+		LOG(HAL, Error) << "Empty stream configuration";
+		return -EINVAL;
+	}
+
 	/*
 	 * Generate an empty configuration, and construct a StreamConfiguration
 	 * for each camera3_stream to add to it.