diff --git a/src/components/TagSelect/index.js b/src/components/TagSelect/index.js
index c4ea4955acd8133e7416f0a0474700295a257c3a..83acfa1fd615f8d4e1eb161a19125c9f18c6c2d2 100644
--- a/src/components/TagSelect/index.js
+++ b/src/components/TagSelect/index.js
@@ -17,8 +17,9 @@ TagSelectOption.isTagSelectOption = true;
 class TagSelect extends Component {
   static getDerivedStateFromProps(nextProps) {
     if ('value' in nextProps && nextProps.value) {
-      this.setState({ value: nextProps.value });
+      return { value: nextProps.value };
     }
+    return null;
   }
 
   state = {