diff --git a/admin/src/System/SystemForm.js b/admin/src/System/SystemForm.js
index 47ba131..97e7b0b 100644
--- a/admin/src/System/SystemForm.js
+++ b/admin/src/System/SystemForm.js
@@ -40,11 +40,12 @@ const SystemForm = (props) => {
 
   useEffect(() => {
     if (props.isEditing && props.system) {
+      var statusSet = (props.system.status && props.system.status.length > 0 ) ? true : false;
       setName(props.system.name);
       setShortName(props.system.shortName);
       setDescription(props.system.description);
       setStatus(props.system.status);
-      setShowStatus(props.system.status.length > 0);
+      setShowStatus(statusSet);
       setSystemType(props.system.systemType);
       setCity(props.system.city);
       setSystemState(props.system.state)