diff --git a/api/datastore/sql/sql.go b/api/datastore/sql/sql.go
index e427bb842..62f1e0758 100644
--- a/api/datastore/sql/sql.go
+++ b/api/datastore/sql/sql.go
@@ -229,10 +229,11 @@ func (ds *sqlStore) RemoveApp(ctx context.Context, appName string) error {
 	if err != nil {
 		return err
 	}
-	if _, err := res.RowsAffected(); err != nil {
+	_, err = res.RowsAffected()
+	if err == sql.ErrNoRows {
 		return models.ErrAppsNotFound
 	}
-	return nil
+	return err
 }
 
 func (ds *sqlStore) GetApp(ctx context.Context, name string) (*models.App, error) {