diff --git a/app/client/src/components/propertyControls/KeyValueComponent.tsx b/app/client/src/components/propertyControls/KeyValueComponent.tsx
index 0782403213..1f6fdf02c0 100644
--- a/app/client/src/components/propertyControls/KeyValueComponent.tsx
+++ b/app/client/src/components/propertyControls/KeyValueComponent.tsx
@@ -56,6 +56,7 @@ interface KeyValueComponentProps {
   pairs: SegmentedControlOption[];
   updatePairs: UpdatePairFunction;
   addLabel?: string;
+  allowEmpty?: boolean;
 }
 
 type SegmentedControlOptionWithKey = SegmentedControlOption & {
@@ -223,8 +224,8 @@ export function KeyValueComponent(props: KeyValueComponentProps) {
             />
             <StyledBox />
             <Button
-              // At least one pair must be present
-              isDisabled={renderPairs.length <= 1}
+              // we don't want to allow deleting the only pair if allowEmpty is false
+              isDisabled={props.allowEmpty ? false : renderPairs.length <= 1}
               isIconButton
               kind="tertiary"
               onClick={(e: React.MouseEvent) => {
diff --git a/app/client/src/components/propertyControls/OptionControl.tsx b/app/client/src/components/propertyControls/OptionControl.tsx
index c4ab3c911c..2b23f9c8ac 100644
--- a/app/client/src/components/propertyControls/OptionControl.tsx
+++ b/app/client/src/components/propertyControls/OptionControl.tsx
@@ -10,6 +10,7 @@ class OptionControl extends BaseControl<ControlProps> {
   render() {
     return (
       <KeyValueComponent
+        allowEmpty={this.props.controlConfig?.allowEmpty as boolean}
         pairs={this.props.propertyValue}
         updatePairs={this.updateOptions}
       />