diff --git a/src/enhance.js b/src/enhance.js
index 0da0c97..1b1d30d 100644
--- a/src/enhance.js
+++ b/src/enhance.js
@@ -12,9 +12,15 @@ export default function(Navigator: *) {
     const nextScreens = {};
 
     for (const screen in screens) {
+      let enhancedScreen = screens[screen].screen;
+
+      if(typeof screens[screen].screen.router === 'undefined') {
+        enhancedScreen = enhanceScreen(enhancedScreen);
+      }
+
       nextScreens[screen] = {
         ...screens[screen],
-        screen: enhanceScreen(screens[screen].screen),
+        screen: enhancedScreen,
       };
     }