diff --git a/storage/store/database/database.go b/storage/store/database/database.go
index becedf73..f793555b 100644
--- a/storage/store/database/database.go
+++ b/storage/store/database/database.go
@@ -644,16 +644,10 @@ func (s *Store) getNumberOfEventsByServiceID(tx *sql.Tx, serviceID int64) (int64
 		return 0, err
 	}
 	var numberOfEvents int64
-	var found bool
 	for rows.Next() {
 		_ = rows.Scan(&numberOfEvents)
-		found = true
-		break
 	}
 	_ = rows.Close()
-	if !found {
-		return 0, errNoRowsReturned
-	}
 	return numberOfEvents, nil
 }
 
@@ -663,16 +657,10 @@ func (s *Store) getNumberOfResultsByServiceID(tx *sql.Tx, serviceID int64) (int6
 		return 0, err
 	}
 	var numberOfResults int64
-	var found bool
 	for rows.Next() {
 		_ = rows.Scan(&numberOfResults)
-		found = true
-		break
 	}
 	_ = rows.Close()
-	if !found {
-		return 0, errNoRowsReturned
-	}
 	return numberOfResults, nil
 }
 
diff --git a/storage/store/database/database_test.go b/storage/store/database/database_test.go
index 5f3ddebf..492e271f 100644
--- a/storage/store/database/database_test.go
+++ b/storage/store/database/database_test.go
@@ -248,6 +248,9 @@ func TestStore_InvalidTransaction(t *testing.T) {
 	defer store.Close()
 	tx, _ := store.db.Begin()
 	tx.Commit()
+	if err := store.insertEvent(tx, 1, core.NewEventFromResult(&testSuccessfulResult)); err == nil {
+		t.Error("should've returned an error, because the transaction was already committed")
+	}
 	if err := store.insertResult(tx, 1, &testSuccessfulResult); err == nil {
 		t.Error("should've returned an error, because the transaction was already committed")
 	}