diff --git a/RNTester/js/SwitchExample.js b/RNTester/js/SwitchExample.js
index ca36372e3788be..d1d81811b2b7c0 100644
--- a/RNTester/js/SwitchExample.js
+++ b/RNTester/js/SwitchExample.js
@@ -54,6 +54,10 @@ class BasicSwitchExample extends React.Component<
           <Switch
             testID="on-off-initial-off"
             onValueChange={value => this.setState({falseSwitchIsOn: value})}
+            trackColor={{
+              true: 'yellow',
+              false: 'purple',
+            }}
             value={this.state.falseSwitchIsOn}
           />
           <OnOffIndicator
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
index 4dd299ccaa43ee..acaaf1b96feca9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.java
@@ -36,6 +36,7 @@ public void setChecked(boolean checked) {
     if (mAllowChange && isChecked() != checked) {
       mAllowChange = false;
       super.setChecked(checked);
+      setTrackColor(checked);
     }
   }
 
@@ -59,12 +60,7 @@ public void setThumbColor(@Nullable Integer color) {
     // If the switch has a different value than the value sent by JS, we must change it.
     if (isChecked() != on) {
       super.setChecked(on);
-      if (mTrackColorForTrue != null || mTrackColorForFalse != null) {
-        // Update the track color to reflect the new value. We only want to do this if these
-        // props were actually set from JS; otherwise we'll just reset the color to the default.
-        Integer currentTrackColor = on ? mTrackColorForTrue : mTrackColorForFalse;
-        setTrackColor(currentTrackColor);
-      }
+      setTrackColor(on);
     }
     mAllowChange = true;
   }
@@ -90,4 +86,13 @@ public void setTrackColorForFalse(@Nullable Integer color) {
       setTrackColor(mTrackColorForFalse);
     }
   }
+
+  private void setTrackColor(boolean checked) {
+    if (mTrackColorForTrue != null || mTrackColorForFalse != null) {
+      // Update the track color to reflect the new value. We only want to do this if these
+      // props were actually set from JS; otherwise we'll just reset the color to the default.
+      Integer currentTrackColor = checked ? mTrackColorForTrue : mTrackColorForFalse;
+      setTrackColor(currentTrackColor);
+    }
+  }
 }