diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index a53c8527a..f48f78a4d 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -270,7 +270,7 @@ export default function Swap() {
               render={() => {
                 if (tradeTxData && !conversionError) {
                   return <Redirect to={{ pathname: AWAITING_SWAP_ROUTE }} />;
-                } else if (tradeTxData) {
+                } else if (tradeTxData && routeState) {
                   return <Redirect to={{ pathname: SWAPS_ERROR_ROUTE }} />;
                 } else if (routeState === 'loading' && aggregatorMetadata) {
                   return <Redirect to={{ pathname: LOADING_QUOTES_ROUTE }} />;