diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index bb626497e7..9883d701ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -70,6 +70,7 @@ import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.tracing.Trace;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
@@ -110,8 +111,11 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   public void onCreate() {
+    Tracer.getInstance().start("Application#onCreate()");
     long startTime = System.currentTimeMillis();
+
     super.onCreate();
+
     initializeSecurityProvider();
     initializeLogging();
     Log.i(TAG, "onCreate()");
@@ -148,6 +152,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     DynamicTheme.setDefaultDayNightMode(this);
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
+    Tracer.getInstance().end("Application#onCreate()");
   }
 
   @Override
diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index b31e32fc5e..36465aa560 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
@@ -49,6 +50,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
 
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
+    Tracer.getInstance().start(Log.tag(getClass()) + "#onCreate()");
     this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
@@ -61,6 +63,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       initializeClearKeyReceiver();
       onCreate(savedInstanceState, true);
     }
+    Tracer.getInstance().end(Log.tag(getClass()) + "#onCreate()");
   }
 
   protected void onPreCreate() {}