diff --git a/management/server/posture_checks_test.go b/management/server/posture_checks_test.go
index d837120f4..b618fb20b 100644
--- a/management/server/posture_checks_test.go
+++ b/management/server/posture_checks_test.go
@@ -29,7 +29,7 @@ func TestDefaultAccountManager_PostureCheck(t *testing.T) {
 
 	t.Run("Generic posture check flow", func(t *testing.T) {
 		// regular users can not create checks
-		err := am.SavePostureChecks(context.Background(), account.Id, regularUserID, &posture.Checks{})
+		err := am.SavePostureChecks(context.Background(), account.Id, regularUserID, &posture.Checks{}, false)
 		assert.Error(t, err)
 
 		// regular users cannot list check
@@ -45,7 +45,7 @@ func TestDefaultAccountManager_PostureCheck(t *testing.T) {
 					MinVersion: "0.26.0",
 				},
 			},
-		})
+		}, false)
 		assert.NoError(t, err)
 
 		// admin users can list check
@@ -66,7 +66,7 @@ func TestDefaultAccountManager_PostureCheck(t *testing.T) {
 					},
 				},
 			},
-		})
+		}, false)
 		assert.Error(t, err)
 
 		// admins can update posture checks
@@ -78,7 +78,7 @@ func TestDefaultAccountManager_PostureCheck(t *testing.T) {
 					MinVersion: "0.27.0",
 				},
 			},
-		})
+		}, false)
 		assert.NoError(t, err)
 
 		// users should not be able to delete posture checks
diff --git a/management/server/sql_store.go b/management/server/sql_store.go
index a1e036c4e..02d186804 100644
--- a/management/server/sql_store.go
+++ b/management/server/sql_store.go
@@ -1057,14 +1057,18 @@ func (s *SqlStore) GetAccountDNSSettings(ctx context.Context, lockStrength Locki
 
 // AccountExists checks whether an account exists by the given ID.
 func (s *SqlStore) AccountExists(ctx context.Context, lockStrength LockingStrength, id string) (bool, error) {
-	var count int64
+	var accountID string
 
 	result := s.db.WithContext(ctx).Clauses(clause.Locking{Strength: string(lockStrength)}).Model(&Account{}).
-		Where(idQueryCondition, id).Count(&count)
+		Select("id").First(&accountID, idQueryCondition, id)
 	if result.Error != nil {
+		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return false, nil
+		}
 		return false, result.Error
 	}
-	return count > 0, nil
+
+	return accountID != "", nil
 }
 
 // GetAccountDomainAndCategory retrieves the Domain and DomainCategory fields for an account based on the given accountID.