diff --git a/admin/src/components/Input/index.js b/admin/src/components/Input/index.js
index 69cbec9..c39aab3 100644
--- a/admin/src/components/Input/index.js
+++ b/admin/src/components/Input/index.js
@@ -94,16 +94,25 @@ const Tags = ({
     const inputValue = (props.value && props.value.trim().toLowerCase()) || "";
     const inputLength = inputValue.length;
 
-    let s = suggestions;
-
-    if (suggestions.length <= 0) {
+    let s = suggestions.data ? suggestions.data : suggestions;
+    if (suggestions <= 0) {
       getSuggestions();
     }
 
     if (inputLength > 0) {
-      s = suggestions.filter((state) => {
-        return state.name.toLowerCase().slice(0, inputLength) === inputValue;
-      });
+      s = s.map((state) => {
+        const suggestionName = state.attributes
+          ? state.attributes.name.toLowerCase()
+          : state.name.toLowerCase();
+
+        if (suggestionName.slice(0, inputLength) === inputValue) {
+          return {
+            id: state.id,
+            name: suggestionName,
+          };
+        }
+        return null
+      }).filter((ele) => ele !== null || ele != undefined);
     }
 
     return (
@@ -130,7 +139,8 @@ const Tags = ({
       // GenericInput calls formatMessage and returns a string for the error
       error={error}
       hint={description && formatMessage(description)}
-      required={required}>
+      required={required}
+    >
       <Flex
         direction="column"
         alignItems="stretch"
@@ -138,7 +148,8 @@ const Tags = ({
         style={{
           position: `relative`,
         }}
-        ref={inputEle}>
+        ref={inputEle}
+      >
         <FieldLabel action={labelAction}>{formatMessage(intlLabel)}</FieldLabel>
         <Flex direction="column">
           <TagsInput
diff --git a/package.json b/package.json
index 0d9723b..a498fd0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-tagsinput",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Tagsinput plugin for your strapi project",
   "strapi": {
     "name": "tagsinput",