diff --git a/lib/RouteMapper.ios.js b/lib/RouteMapper.ios.js
index 61d1e2c..f2e3bde 100644
--- a/lib/RouteMapper.ios.js
+++ b/lib/RouteMapper.ios.js
@@ -23,10 +23,12 @@ export function leftButtonRouteMapperGenerator (BackComponent, styles, tintColor
 export function rightButtonRouteMapperGenerator (RightComponent, topNavigator) {
   return {
     RightButton: (route, navigator, index, navState) => {
-      if (RightComponent) {
+      if (RightComponent && !route.rightElement) {
         return <RightComponent navigator={navigator} topNavigator={topNavigator} />
       }
-      return route.rightElement
+      if (route.rightElement) {
+        return route.rightElement
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 60495d6..740ecb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigator-wrapper",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A React Native Navigator component wrapper that implements nested navigators for both push and modal transitions.",
   "main": "index.js",
   "scripts": {