diff --git a/src/xenia/kernel/app.cc b/src/xenia/kernel/app.cc
index 619b0522b..05c3e0759 100644
--- a/src/xenia/kernel/app.cc
+++ b/src/xenia/kernel/app.cc
@@ -30,7 +30,7 @@ X_RESULT XAppManager::DispatchMessageSync(uint32_t app_id, uint32_t message,
                                           uint32_t buffer_length) {
   const auto& it = app_lookup_.find(app_id);
   if (it == app_lookup_.end()) {
-    return X_ERROR_NOT_FOUND;
+    return X_STATUS_UNSUCCESSFUL;
   }
   return it->second->DispatchMessageSync(message, buffer_ptr, buffer_length);
 }
diff --git a/src/xenia/kernel/apps/xgi_app.cc b/src/xenia/kernel/apps/xgi_app.cc
index 4a02b266d..4172d2f92 100644
--- a/src/xenia/kernel/apps/xgi_app.cc
+++ b/src/xenia/kernel/apps/xgi_app.cc
@@ -64,7 +64,7 @@ X_RESULT XXGIApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
       // - [this]
       // - CloseHandle
       XELOGD("XSessionCreateImpl(...)");
-      return X_ERROR_FUNCTION_FAILED;
+      return X_STATUS_UNSUCCESSFUL;
     }
     case 0x000B0041: {
       assert_true(!buffer_length || buffer_length == 32);
@@ -90,7 +90,7 @@ X_RESULT XXGIApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
   }
   XELOGE("Unimplemented XGI message app=%.8X, msg=%.8X, arg1=%.8X, arg2=%.8X",
          app_id(), message, buffer_ptr, buffer_length);
-  return X_ERROR_NOT_FOUND;
+  return X_STATUS_UNSUCCESSFUL;
 }
 
 }  // namespace apps
diff --git a/src/xenia/kernel/apps/xlivebase_app.cc b/src/xenia/kernel/apps/xlivebase_app.cc
index 02c32be60..30532065c 100644
--- a/src/xenia/kernel/apps/xlivebase_app.cc
+++ b/src/xenia/kernel/apps/xlivebase_app.cc
@@ -41,19 +41,19 @@ X_RESULT XXLiveBaseApp::DispatchMessageSync(uint32_t message,
       // buffer_length seems to be the same ptr sent to 0x00058004.
       XELOGD("XLiveBaseFriendsCreateEnumerator(%.8X, %.8X) unimplemented",
              buffer_ptr, buffer_length);
-      return X_ERROR_FUNCTION_FAILED;
+      return X_STATUS_UNSUCCESSFUL;
     }
     case 0x00058023: {
       XELOGD("XliveBaseUnk58023(%.8X, %.8X) unimplemented", buffer_ptr,
              buffer_length);
-      return X_ERROR_FUNCTION_FAILED;
+      return X_STATUS_UNSUCCESSFUL;
     }
   }
   XELOGE(
       "Unimplemented XLIVEBASE message app=%.8X, msg=%.8X, arg1=%.8X, "
       "arg2=%.8X",
       app_id(), message, buffer_ptr, buffer_length);
-  return X_ERROR_NOT_FOUND;
+  return X_STATUS_UNSUCCESSFUL;
 }
 
 }  // namespace apps
diff --git a/src/xenia/kernel/apps/xmp_app.cc b/src/xenia/kernel/apps/xmp_app.cc
index a77ee0d17..103893c53 100644
--- a/src/xenia/kernel/apps/xmp_app.cc
+++ b/src/xenia/kernel/apps/xmp_app.cc
@@ -320,7 +320,7 @@ X_RESULT XXMPApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
       assert_zero(unk_ptr);
       XELOGE("XMPGetInfo?(%.8X, %.8X)", unk_ptr, info_ptr);
       if (!active_playlist_) {
-        return X_ERROR_NOT_FOUND;
+        return X_STATUS_UNSUCCESSFUL;
       }
       auto& song = active_playlist_->songs[active_song_index_];
       xe::store_and_swap<uint32_t>(info + 0, song->handle);
@@ -410,12 +410,12 @@ X_RESULT XXMPApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
       // XMPCaptureOutput - not sure how this works :/
       XELOGD("XMPCaptureOutput(...)");
       assert_always("XMP output not unimplemented");
-      return X_ERROR_INVALID_PARAMETER;
+      return X_STATUS_UNSUCCESSFUL;
     }
   }
   XELOGE("Unimplemented XMP message app=%.8X, msg=%.8X, arg1=%.8X, arg2=%.8X",
          app_id(), message, buffer_ptr, buffer_length);
-  return X_ERROR_NOT_FOUND;
+  return X_STATUS_UNSUCCESSFUL;
 }
 
 }  // namespace apps