diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index 5d05b8fba3..36f29b3f31 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -252,7 +252,7 @@ Item {
             height: 50;
             text: "Cancel";
             onClicked: {
-                sendSignalToWallet({method: 'walletSetup_cancelClicked', referrer: root.referrer ? root.referrer : "" });
+                sendSignalToWallet({method: 'walletSetup_cancelClicked', referrer: root.referrer });
             }
         }   
     }
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index a37f2bfe91..4ad043f71e 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -67,6 +67,8 @@
             case 'walletSetup_cancelClicked':
                 switch (message.referrer) {
                     case '': // User clicked "Wallet" app
+                    case undefined:
+                    case null:
                         tablet.gotoHomeScreen();
                         break;
                     case 'purchases':