diff --git a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
index c089baeee..eb952447d 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/MainApplication.java
@@ -127,10 +127,7 @@ public class MainApplication extends NavigationApplication implements INotificat
     super.onCreate();
     instance = this;
 
-    // TODO: Right now I get a black screen when resuming the app from the
-    // background if these callbacks are registered. I'm commenting this out
-    // to move forward and will come back to this at a later date.
-    //registerActivityLifecycleCallbacks(new ManagedActivityLifecycleCallbacks());
+    registerActivityLifecycleCallbacks(new ManagedActivityLifecycleCallbacks());
 
     // Delete any previous temp files created by the app
     File tempFolder = new File(getApplicationContext().getCacheDir(), "mmShare");
diff --git a/android/app/src/main/java/com/mattermost/rnbeta/ManagedActivityLifecycleCallbacks.java b/android/app/src/main/java/com/mattermost/rnbeta/ManagedActivityLifecycleCallbacks.java
index a3fdfe59f..cebf7a187 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/ManagedActivityLifecycleCallbacks.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/ManagedActivityLifecycleCallbacks.java
@@ -17,6 +17,7 @@ import java.util.Set;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 public class ManagedActivityLifecycleCallbacks implements ActivityLifecycleCallbacks {
@@ -96,7 +97,10 @@ public class ManagedActivityLifecycleCallbacks implements ActivityLifecycleCallb
     }
 
     private void sendConfigChanged(Bundle config) {
-        Object result = Arguments.fromBundle(config);
+        WritableMap result = Arguments.createMap();
+        if (config != null) {
+            result = Arguments.fromBundle(config);
+        }
         ReactContext ctx = MainApplication.instance.getRunningReactContext();
 
         if (ctx != null) {