Von Wafer will hit the free agent market again this summer, but he hopes to remain with the Rockets.
"I hope I'll be back," Wafer said. "I love Houston, I love this organization. They gave me a chance, so I'd love to be back."
Wafer has played on five teams in four NBA seasons.