diff --git a/src/views/ScenesReducer.js b/src/views/ScenesReducer.js
index fe4db773..2ef07a06 100644
--- a/src/views/ScenesReducer.js
+++ b/src/views/ScenesReducer.js
@@ -65,6 +65,17 @@ export default function ScenesReducer(
   prevState,
   descriptors
 ) {
+  // Always update the descriptors
+  // This is a workaround for https://github.com/react-navigation/react-navigation/issues/4271
+  // It will be resolved in a better way when we re-write Transitioner
+  scenes.forEach(scene => {
+    const { route } = scene;
+    if (descriptors[route.key]) {
+      scene.descriptor = descriptors[route.key];
+    }
+  });
+
+  // Bail out early if we didn't update the state
   if (prevState === nextState) {
     return scenes;
   }
diff --git a/src/views/StackView/StackView.js b/src/views/StackView/StackView.js
index fcdc5dff..a3a5c56a 100644
--- a/src/views/StackView/StackView.js
+++ b/src/views/StackView/StackView.js
@@ -22,6 +22,7 @@ class StackView extends React.Component {
       <Transitioner
         render={this._render}
         configureTransition={this._configureTransition}
+        screenProps={this.props.screenProps}
         navigation={this.props.navigation}
         descriptors={this.props.descriptors}
         onTransitionStart={this.props.onTransitionStart}
diff --git a/src/views/Transitioner.js b/src/views/Transitioner.js
index ac963389..c921ed51 100644
--- a/src/views/Transitioner.js
+++ b/src/views/Transitioner.js
@@ -63,6 +63,12 @@ class Transitioner extends React.Component {
       nextScenes = filterStale(nextScenes);
     }
 
+    // Update nextScenes when we change screenProps
+    // This is a workaround for https://github.com/react-navigation/react-navigation/issues/4271
+    if (nextProps.screenProps !== this.props.screenProps) {
+      this.setState({ nextScenes });
+    }
+
     if (nextScenes === this.state.scenes) {
       return;
     }