diff --git a/rpc/rpc.go b/rpc/rpc.go
index b51cdb6423..313ccd052d 100644
--- a/rpc/rpc.go
+++ b/rpc/rpc.go
@@ -161,21 +161,26 @@ func getAPIs(hmy *hmy.Harmony, debugEnable bool, rateLimiterEnable bool, ratelim
 		NewPublicPoolAPI(hmy, Eth),
 		NewPublicStakingAPI(hmy, V1),
 		NewPublicStakingAPI(hmy, V2),
-		NewPublicDebugAPI(hmy, V1),
-		NewPublicDebugAPI(hmy, V2),
 		// Legacy methods (subject to removal)
 		v1.NewPublicLegacyAPI(hmy, "hmy"),
 		eth.NewPublicEthService(hmy, "eth"),
 		v2.NewPublicLegacyAPI(hmy, "hmyv2"),
 	}
 
+	publicDebugAPIs := []rpc.API{
+		//Public debug API
+		NewPublicDebugAPI(hmy, V1),
+		NewPublicDebugAPI(hmy, V2),
+	}
+
 	privateAPIs := []rpc.API{
 		NewPrivateDebugAPI(hmy, V1),
 		NewPrivateDebugAPI(hmy, V2),
 	}
 
 	if debugEnable {
-		return append(publicAPIs, privateAPIs...)
+		apis := append(publicAPIs, publicDebugAPIs...)
+		return append(apis, privateAPIs...)
 	}
 	return publicAPIs
 }