diff --git a/client/src/components/Form/FormRepeat.vue b/client/src/components/Form/FormRepeat.vue
index b2cf51a3b384..dfc29a53f847 100644
--- a/client/src/components/Form/FormRepeat.vue
+++ b/client/src/components/Form/FormRepeat.vue
@@ -146,9 +146,12 @@ const { keyObject } = useKeyedObjects();
             </template>
         </FormCard>
 
-        <b-button v-if="!props.sustainRepeats" @click="onInsert">
+        <b-button v-if="!props.sustainRepeats && props.input.cache.length < props.input.max" @click="onInsert">
             <FontAwesomeIcon icon="plus" class="mr-1" />
             <span data-description="repeat insert">Insert {{ props.input.title || "Repeat" }}</span>
         </b-button>
+        <div v-if="props.input.cache.length >= props.input.max">
+            Maximum of {{ props.input.cache.length }} {{ props.input.title || "Repeat" }} fields reached
+        </div>
     </div>
 </template>