diff --git a/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java b/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java
index 8db2ec4c7..a55fbfa86 100644
--- a/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java
+++ b/implementation/src/main/java/io/smallrye/config/SmallRyeConfig.java
@@ -184,11 +184,11 @@ public <T, C extends Collection<T>> C getValues(String name, Class<T> itemClass,
     }
 
     public <T, C extends Collection<T>> C getValues(String name, Converter<T> converter, IntFunction<C> collectionFactory) {
-        try {
-            return getIndexedValues(name, converter, collectionFactory);
-        } catch (NoSuchElementException e) {
-            return getValue(name, newCollectionConverter(converter, collectionFactory));
+        List<String> indexedProperties = getIndexedProperties(name);
+        if (!indexedProperties.isEmpty()) {
+            return getIndexedValues(indexedProperties, converter, collectionFactory);
         }
+        return getValue(name, newCollectionConverter(converter, collectionFactory));
     }
 
     public <T, C extends Collection<T>> C getIndexedValues(String name, Converter<T> converter,
@@ -197,12 +197,15 @@ public <T, C extends Collection<T>> C getIndexedValues(String name, Converter<T>
         if (indexedProperties.isEmpty()) {
             throw new NoSuchElementException(ConfigMessages.msg.propertyNotFound(name));
         }
+        return getIndexedValues(indexedProperties, converter, collectionFactory);
+    }
 
-        final C collection = collectionFactory.apply(indexedProperties.size());
+    private <T, C extends Collection<T>> C getIndexedValues(List<String> indexedProperties, Converter<T> converter,
+            IntFunction<C> collectionFactory) {
+        C collection = collectionFactory.apply(indexedProperties.size());
         for (String indexedProperty : indexedProperties) {
             collection.add(getValue(indexedProperty, converter));
         }
-
         return collection;
     }
 
diff --git a/implementation/src/test/java/io/smallrye/config/SmallRyeConfigTest.java b/implementation/src/test/java/io/smallrye/config/SmallRyeConfigTest.java
index fee700c0c..4bea991d8 100644
--- a/implementation/src/test/java/io/smallrye/config/SmallRyeConfigTest.java
+++ b/implementation/src/test/java/io/smallrye/config/SmallRyeConfigTest.java
@@ -134,7 +134,8 @@ void getIndexedValues() {
                         "server.environments[2]", "prod"))
                 .build();
 
-        List<String> environments = config.getValues("server.environments", String.class);
+        List<String> environments = config.getIndexedValues("server.environments", config.requireConverter(String.class),
+                ArrayList::new);
         assertEquals(3, environments.size());
         assertEquals("dev", environments.get(0));
         assertEquals("dev", config.getValue("server.environments[0]", String.class));
@@ -142,6 +143,9 @@ void getIndexedValues() {
         assertEquals("qa", config.getValue("server.environments[1]", String.class));
         assertEquals("prod", environments.get(2));
         assertEquals("prod", config.getValue("server.environments[2]", String.class));
+
+        assertThrows(NoSuchElementException.class,
+                () -> config.getIndexedValues("not.found", config.requireConverter(String.class), ArrayList::new));
     }
 
     @Test