diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js
index 4db09a6..3b7dc76 100644
--- a/src/component/AppNavigator.js
+++ b/src/component/AppNavigator.js
@@ -200,6 +200,7 @@ const drawer = createDrawerNavigator(
   {
     drawerWidth: 300,
     headerMode: 'none',
+    unmountInactiveRoutes: true,
     contentComponent: DrawerContent,
     contentOptions: {
       activeTintColor: Colors.LbryGreen,
diff --git a/src/page/file/view.js b/src/page/file/view.js
index 700b3ca..0946718 100644
--- a/src/page/file/view.js
+++ b/src/page/file/view.js
@@ -497,7 +497,7 @@ class FilePage extends React.PureComponent {
       return;
     }
 
-    sendTip(tipAmount, claim.claim_id, isSupport: false, () => {
+    sendTip(tipAmount, claim.claim_id, uri, () => {
       this.setState({ tipAmount: 0, showTipView: false });
     });
   };