diff --git a/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp b/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
index 8f514d72..bbc03a18 100644
--- a/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
+++ b/tools/hdi-gen/codegen/cpp_client_proxy_code_emitter.cpp
@@ -375,7 +375,7 @@ void CppClientProxyCodeEmitter::EmitProxyMethodBody(
         }
     }
 
-    sb.Append(prefix + TAB).Append("return HDF_SUCCESS;\n");
+    sb.Append(prefix + TAB).AppendFormat("return %s;\n", errorCodeName_.string());
     sb.Append(prefix).Append("}\n");
 }
 
diff --git a/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp b/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
index f140f780..2ceedbf0 100644
--- a/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
+++ b/tools/hdi-gen/codegen/cpp_service_stub_code_emitter.cpp
@@ -350,7 +350,7 @@ void CppServiceStubCodeEmitter::EmitStubMethodImpl(
         }
     }
 
-    sb.Append(prefix + TAB).Append("return HDF_SUCCESS;\n");
+    sb.Append(prefix + TAB).AppendFormat("return %s;\n", errorCodeName_.string());
     sb.Append("}\n");
 }