diff --git a/app/scripts/lib/controllers/shapeshift.js b/app/scripts/lib/controllers/shapeshift.js
index 6d1c95323..ec27b37a0 100644
--- a/app/scripts/lib/controllers/shapeshift.js
+++ b/app/scripts/lib/controllers/shapeshift.js
@@ -39,7 +39,9 @@ class ShapeshiftController {
     const old = shapeShiftTxList.find((tx) => {
       return tx.time + TIMEOUT_LIMIT < now
     })
-    old.forEach(tx => this.removeShapeShiftTx(tx))
+    if (old) {
+      old.forEach(tx => this.removeShapeShiftTx(tx))
+    }
   }
 
   pollForUpdates () {