diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c28aed7b3b..5c77b674fee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - added: Buy conversion tracking for Moonpay
 - added: Error tracking for failure to report conversions to referral server
+- changed: Remove whitespaces from custom token contract address input
 - fixed: Clear previous swap errors when new amounts are entered or swap assets are changed in `SwapCreateScene`
 - fixed: Cases where it was possible to create duplicate custom tokens
 - fixed: Message about overriding a built-in token contract, which is not possible to do
diff --git a/src/components/scenes/EditTokenScene.tsx b/src/components/scenes/EditTokenScene.tsx
index 2ed6fe0e986..f56634259a2 100644
--- a/src/components/scenes/EditTokenScene.tsx
+++ b/src/components/scenes/EditTokenScene.tsx
@@ -224,7 +224,7 @@ function EditTokenSceneComponent(props: Props) {
               onChangeText={value =>
                 setLocation(location => {
                   const out = new Map(location)
-                  out.set(item.key, value)
+                  out.set(item.key, value.replace(/\s/g, ''))
                   return out
                 })
               }