diff --git a/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json b/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json
new file mode 100644
index 00000000000..fd332b25345
--- /dev/null
+++ b/change/@office-iss-react-native-win32-2020-05-07-14-18-13-clifeedback.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Align local metro config with future CLI changes",
+  "packageName": "@office-iss/react-native-win32",
+  "email": "acoates@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-05-07T21:18:12.974Z"
+}
diff --git a/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json b/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json
new file mode 100644
index 00000000000..0a15e1dc31e
--- /dev/null
+++ b/change/react-native-windows-2020-05-07-14-18-13-clifeedback.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Align local metro config with future CLI changes",
+  "packageName": "react-native-windows",
+  "email": "acoates@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-05-07T21:18:13.813Z"
+}
diff --git a/packages/react-native-win32/metro-react-native-platform.js b/packages/react-native-win32/metro-react-native-platform.js
index daf9a550e04..bce9b4f4a36 100644
--- a/packages/react-native-win32/metro-react-native-platform.js
+++ b/packages/react-native-win32/metro-react-native-platform.js
@@ -29,11 +29,11 @@ function reactNativePlatformResolver(platformImplementations) {
         }
       }
       let result = resolve(context, modifiedModuleName, platform);
-      context.resolveRequest = backupResolveRequest;
       return result;
     } catch (e) {
-      context.resolveRequest = backupResolveRequest;
       throw e;
+    } finally {
+      context.resolveRequest = backupResolveRequest;
     }
   };
 }
diff --git a/vnext/metro-react-native-platform.js b/vnext/metro-react-native-platform.js
index e9acdf525a7..5ee8ff3d65a 100644
--- a/vnext/metro-react-native-platform.js
+++ b/vnext/metro-react-native-platform.js
@@ -29,11 +29,11 @@ function reactNativePlatformResolver(platformImplementations) {
         }
       }
       let result = resolve(context, modifiedModuleName, platform);
-      context.resolveRequest = backupResolveRequest;
       return result;
     } catch (e) {
-      context.resolveRequest = backupResolveRequest;
       throw e;
+    } finally {
+      context.resolveRequest = backupResolveRequest;
     }
   };
 }