diff --git a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
index d6ae88792..ef1d68fcb 100644
--- a/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
+++ b/Libraries/Renderer/src/renderers/native/ReactNativeStack.js
@@ -37,7 +37,11 @@ var ReactNative = {
   // The injected findNodeHandle() strategy returns the instance wrapper though.
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
   findNodeHandle(componentOrHandle : any) : ?number {
-    return findNodeHandle(componentOrHandle).getHostNode();
+    const nodeHandle = findNodeHandle(componentOrHandle);
+    if (nodeHandle == null || typeof nodeHandle === 'number') {
+      return nodeHandle;
+    }
+    return nodeHandle.getHostNode();
   },
 
   render: render,