diff --git a/server/internal/db/struct_query.go b/server/internal/db/struct_query.go
index d3d2ddd..9230fdb 100644
--- a/server/internal/db/struct_query.go
+++ b/server/internal/db/struct_query.go
@@ -55,6 +55,7 @@ func StructTagsToFields(s any) ([]DBField, error) {
 
 		useDefault := false
 		encrypted := false
+		ommit := false
 
 		if strings.Contains(tag, ",") {
 			parts := strings.Split(tag, ",")
@@ -64,7 +65,7 @@ func StructTagsToFields(s any) ([]DBField, error) {
 				switch opt {
 				case "omitempty":
 					if reflect.DeepEqual(v.Field(i).Interface(), reflect.Zero(f.Type).Interface()) {
-						continue
+						ommit = true
 					}
 				case "default":
 					useDefault = true
@@ -74,6 +75,10 @@ func StructTagsToFields(s any) ([]DBField, error) {
 			}
 		}
 
+		if ommit {
+			continue
+		}
+
 		fields = append(fields, DBField{
 			Name:         tag,
 			Value:        v.Field(i).Interface(),