diff --git a/transform/models/tap_spreadsheets_anywhere/scoring.sql b/transform/models/tap_spreadsheets_anywhere/scoring.sql
index a7ebd56..298e403 100644
--- a/transform/models/tap_spreadsheets_anywhere/scoring.sql
+++ b/transform/models/tap_spreadsheets_anywhere/scoring.sql
@@ -16,7 +16,7 @@ total_scores as (
     select
         r.review_id,
         t.section_name                                    as dimension,
-        nullif(regexp_replace(t.final_rating, '^(\d+).*', '\1'), '')::numeric as score_value,
+        nullif(regexp_replace(t.final_rating, '^(\d+).*|.*', '\1'), '')::numeric as score_value,
         nullif(trim(t.final_rating), '')                  as score_text,
         null::text                                        as comment
     from {{ source('tap_spreadsheets_anywhere', 'performance_review_total_scoring') }} t
@@ -29,7 +29,7 @@ sub_scores as (
     select
         r.review_id,
         s.competency_name                                 as dimension,
-        nullif(regexp_replace(s.competency_rating_score, '\D','','g'), '')::numeric as score_value,
+        nullif(regexp_replace(s.competency_rating_score, '^(\d+).*|.*', '\1'), '')::numeric as score_value,
         nullif(trim(s.competency_rating_score), '')       as score_text,
         null::text                                        as comment
     from {{ source('tap_spreadsheets_anywhere', 'performance_review_sub_scoring') }} s