diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index d88064cb2..8b7a49cd2 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -600,9 +600,8 @@ void EmulatorApp::EmulatorThread(bool is_game_process) {
   // UI process: Minimal setup for profiles/GPD only
   if (!is_game_process) {
     // Initialize just enough for profiles: kernel state with XAM module
-    X_STATUS result = emulator_->Setup(emulator_window_->window(),
-                                       emulator_window_->imgui_drawer(), false,
-                                       nullptr, nullptr, nullptr);
+    X_STATUS result = emulator_->Setup(emulator_window_->window(), nullptr,
+                                       false, nullptr, nullptr, nullptr);
     if (XFAILED(result)) {
       XELOGE("Failed to setup minimal emulator for UI: {:08X}", result);
       app_context().RequestDeferredQuit();
diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index 68d74ae98..f85dc7d9b 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -291,8 +291,10 @@ X_STATUS Emulator::Setup(
     return result;
   }
 
-  // Add inputSystem to UI
-  imgui_drawer_->LoadInputSystem(input_system_.get());
+  // Add inputSystem to UI (if imgui is enabled)
+  if (imgui_drawer_) {
+    imgui_drawer_->LoadInputSystem(input_system_.get());
+  }
 
   XELOGI("{}: Initializing VFS...", __func__);
   // Bring up the virtual filesystem used by the kernel.