diff --git a/src/xenia/kernel/xam_content.cc b/src/xenia/kernel/xam_content.cc
index 97469d0ca..5f53bc4ea 100644
--- a/src/xenia/kernel/xam_content.cc
+++ b/src/xenia/kernel/xam_content.cc
@@ -44,6 +44,7 @@ SHIM_CALL XamContentGetLicenseMask_shim(
 }
 
 
+// http://gameservice.googlecode.com/svn-history/r14/trunk/ContentManager.cpp
 SHIM_CALL XamContentCreateEnumerator_shim(
     PPCContext* ppc_state, KernelState* state) {
   uint32_t arg0 = SHIM_GET_ARG_32(0);
@@ -52,12 +53,15 @@ SHIM_CALL XamContentCreateEnumerator_shim(
   uint32_t arg3 = SHIM_GET_ARG_32(3);
   uint32_t arg4 = SHIM_GET_ARG_32(4);
   uint32_t arg5 = SHIM_GET_ARG_32(5);
-  uint32_t arg6 = SHIM_GET_ARG_32(6);
+  uint32_t handle_ptr = SHIM_GET_ARG_32(6);
 
   XELOGD(
       "XamContentCreateEnumerator(%.8X, %.8X, %.8X, %.8X, %.8X, %.8X, %.8X)",
-      arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-  SHIM_SET_RETURN_32(X_ERROR_DEVICE_NOT_CONNECTED);
+      arg0, arg1, arg2, arg3, arg4, arg5, handle_ptr);
+
+  SHIM_SET_MEM_32(handle_ptr, X_INVALID_HANDLE_VALUE);
+
+  SHIM_SET_RETURN_32(X_ERROR_NO_MORE_FILES);
 }