diff --git a/api/datastore/sql/sql.go b/api/datastore/sql/sql.go
index 2a7981ef4..e427bb842 100644
--- a/api/datastore/sql/sql.go
+++ b/api/datastore/sql/sql.go
@@ -221,18 +221,17 @@ func (ds *sqlStore) UpdateApp(ctx context.Context, newapp *models.App) (*models.
 }
 
 func (ds *sqlStore) RemoveApp(ctx context.Context, appName string) error {
-	query := ds.db.Rebind(`DELETE FROM apps WHERE name = ?`)
-	res, err := ds.db.ExecContext(ctx, query, appName)
-	if _, err := res.RowsAffected(); err != nil {
-		return models.ErrAppsNotFound
-	}
-	_, err = ds.db.ExecContext(ctx, ds.db.Rebind(
-		`DELETE FROM logs WHERE app_name=?;
+	res, err := ds.db.ExecContext(ctx, ds.db.Rebind(
+		`DELETE FROM apps WHERE name = ?;
+		DELETE FROM logs WHERE app_name=?;
 		DELETE FROM calls WHERE app_name=?;
-		DELETE FROM routes WHERE app_name=?;`), appName, appName, appName)
+		DELETE FROM routes WHERE app_name=?;`), appName, appName, appName, appName)
 	if err != nil {
 		return err
 	}
+	if _, err := res.RowsAffected(); err != nil {
+		return models.ErrAppsNotFound
+	}
 	return nil
 }