diff --git a/src/Aggregation/Bucketing/RangeAggregation.php b/src/Aggregation/Bucketing/RangeAggregation.php
index e86faedf..8c9b91bb 100644
--- a/src/Aggregation/Bucketing/RangeAggregation.php
+++ b/src/Aggregation/Bucketing/RangeAggregation.php
@@ -90,7 +90,7 @@ function ($v) {
             }
         );
 
-        if (!empty($key)) {
+        if ('' !== $key) {
             $range['key'] = $key;
         }
 
diff --git a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
index 55134a86..dd1e3b3a 100644
--- a/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
+++ b/tests/Unit/Aggregation/Bucketing/RangeAggregationTest.php
@@ -40,6 +40,41 @@ public function testRangeAggregationAddRange()
         $this->assertEquals($result, $aggregation->toArray());
     }
 
+    public function testRangeAggregationAddZeroIndexedKeys()
+    {
+        $aggregation = new RangeAggregation('test_agg');
+        $aggregation->setKeyed(true);
+        $aggregation->setField('test_field');
+        $aggregation->addRange(0, 100, '0');
+        $aggregation->addRange(100, 200, '1');
+        $aggregation->addRange(200, 300);
+
+        $result = [
+            'range' => [
+                'field' => 'test_field',
+                'ranges' => [
+                    [
+                        'from' => 0,
+                        'to' => 100,
+                        'key' => '0'
+                    ],
+                    [
+                        'from' => 100,
+                        'to' => 200,
+                        'key' => '1'
+                    ],
+                    [
+                        'from' => 200,
+                        'to' => 300
+                    ]
+                ],
+                'keyed' => true
+            ],
+        ];
+
+        $this->assertEquals($result, $aggregation->toArray());
+    }
+
     /**
      * Test addRange method with multiple values.
      */