diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index ee0dad5..293ec95 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -1077,6 +1077,18 @@
       this.context = context;
       this.fragmentManager = fragmentManager;
       this.fab = fab;
+      preloadCallLogFragment();
+    }
+
+    private void preloadCallLogFragment() {
+      if (ConfigProviderBindings.get(context).getBoolean("nui_preload_call_log", true)) {
+        CallLogFragment fragment = new CallLogFragment();
+        fragmentManager
+            .beginTransaction()
+            .add(R.id.fragment_container, fragment, CALL_LOG_TAG)
+            .hide(fragment)
+            .commit();
+      }
     }
 
     @Override
