diff --git a/odrefresh/odrefresh_main.cc b/odrefresh/odrefresh_main.cc
index e62bc41..98a75f3 100644
--- a/odrefresh/odrefresh_main.cc
+++ b/odrefresh/odrefresh_main.cc
@@ -257,16 +257,21 @@
   // by others and prevents system_server from loading generated artifacts.
   umask(S_IWGRP | S_IWOTH);
 
-  // Explicitly initialize logging (b/201042799).
-  android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
-
   OdrConfig config(argv[0]);
   int n = InitializeConfig(argc, argv, &config);
+
+  // Explicitly initialize logging (b/201042799).
+  // But not in CompOS mode - logd doesn't exist in Microdroid (b/265153235).
+  if (!config.GetCompilationOsMode()) {
+    android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
+  }
+
   argv += n;
   argc -= n;
   if (argc != 1) {
     ArgumentError("Expected 1 argument, but have %d.", argc);
   }
+
   GetSystemProperties(config.MutableSystemProperties());
 
   OdrMetrics metrics(config.GetArtifactDirectory());
