diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go
index 7124486ad..865051fec 100644
--- a/management/server/store/sql_store.go
+++ b/management/server/store/sql_store.go
@@ -949,6 +949,8 @@ func (s *SqlStore) GetAccount(ctx context.Context, accountID string) (*types.Acc
 				}
 				if autoGroups != nil {
 					_ = json.Unmarshal(autoGroups, &sk.AutoGroups)
+				} else {
+					sk.AutoGroups = []string{}
 				}
 			}
 			return sk, err
@@ -1077,6 +1079,8 @@ func (s *SqlStore) GetAccount(ctx context.Context, accountID string) (*types.Acc
 				}
 				if autoGroups != nil {
 					_ = json.Unmarshal(autoGroups, &u.AutoGroups)
+				} else {
+					u.AutoGroups = []string{}
 				}
 			}
 			return u, err
@@ -1112,7 +1116,11 @@ func (s *SqlStore) GetAccount(ctx context.Context, accountID string) (*types.Acc
 				}
 				if resources != nil {
 					_ = json.Unmarshal(resources, &g.Resources)
+				} else {
+					g.Resources = []types.Resource{}
 				}
+				g.GroupPeers = []types.GroupPeer{}
+				g.Peers = []string{}
 			}
 			return &g, err
 		})
diff --git a/management/server/store/sqlstore_bench_test.go b/management/server/store/sqlstore_bench_test.go
index 711b80b72..2b0256bd8 100644
--- a/management/server/store/sqlstore_bench_test.go
+++ b/management/server/store/sqlstore_bench_test.go
@@ -867,6 +867,8 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
 				}
 				if autoGroups != nil {
 					_ = json.Unmarshal(autoGroups, &sk.AutoGroups)
+				} else {
+					sk.AutoGroups = []string{}
 				}
 			}
 			return sk, err
@@ -995,6 +997,8 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
 				}
 				if autoGroups != nil {
 					_ = json.Unmarshal(autoGroups, &u.AutoGroups)
+				} else {
+					u.AutoGroups = []string{}
 				}
 			}
 			return u, err
@@ -1030,7 +1034,11 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
 				}
 				if resources != nil {
 					_ = json.Unmarshal(resources, &g.Resources)
+				} else {
+					g.Resources = []types.Resource{}
 				}
+				g.GroupPeers = []types.GroupPeer{}
+				g.Peers = []string{}
 			}
 			return &g, err
 		})