diff --git a/src/components/TagSelect/index.js b/src/components/TagSelect/index.js
index c36cd6722e4e32e28ae9140a95a6d53808cbe2f0..f65764f54ac9f2104e8051a0a8fe73b65b6371cd 100644
--- a/src/components/TagSelect/index.js
+++ b/src/components/TagSelect/index.js
@@ -28,8 +28,8 @@ class TagSelect extends Component {
   }
 
   static getDerivedStateFromProps(nextProps) {
-    if ('value' in nextProps && nextProps.value) {
-      return { value: nextProps.value };
+    if ('value' in nextProps) {
+      return { value: nextProps.value || [] };
     }
     return null;
   }