diff --git a/src/PluginContainer.js b/src/PluginContainer.js
index 0af6bf572..aa76973e5 100644
--- a/src/PluginContainer.js
+++ b/src/PluginContainer.js
@@ -101,13 +101,12 @@ class PluginContainer extends PureComponent<Props> {
     const props: PluginProps<Object> = {
       key: pluginKey,
       logger: this.props.logger,
-      persistedState:
-        !isArchivedDevice && activePlugin.defaultPersistedState
-          ? {
-              ...activePlugin.defaultPersistedState,
-              ...pluginState,
-            }
-          : pluginState,
+      persistedState: activePlugin.defaultPersistedState
+        ? {
+            ...activePlugin.defaultPersistedState,
+            ...pluginState,
+          }
+        : pluginState,
       setPersistedState: state => setPluginState({pluginKey, state}),
       target,
       deepLinkPayload: this.props.deepLinkPayload,
diff --git a/src/plugins/crash_reporter/index.js b/src/plugins/crash_reporter/index.js
index 293603631..b6d1ddbab 100644
--- a/src/plugins/crash_reporter/index.js
+++ b/src/plugins/crash_reporter/index.js
@@ -380,6 +380,7 @@ export default class CrashReporterPlugin extends FlipperDevicePlugin<
 
   render() {
     let crash: ?Crash =
+      this.props.persistedState.crashes &&
       this.props.persistedState.crashes.length > 0
         ? this.props.persistedState.crashes[
             this.props.persistedState.crashes.length - 1