diff --git a/src/common-components/base-input-button/button-functionality-props.js b/src/common-components/base-input-button/button-functionality-props.js
index 1faa369e..ec83f95f 100644
--- a/src/common-components/base-input-button/button-functionality-props.js
+++ b/src/common-components/base-input-button/button-functionality-props.js
@@ -3,9 +3,16 @@ export const inputButtonProps = {
         type: [String, Number],
         required: true,
     },
-    modelValue: {
-        type: [Array, String, Number],
+    modelValue: {        
         required: true,
+        validation: function(prop) {
+            return (
+                prop === null
+                || Array.isArray(prop)
+                || typeof prop === 'string'
+                || (typeof prop === 'number' && !Number.isNaN(prop))
+            )
+        }
     },
     isMultiSelect: Boolean,
     groupName: {