diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 49ea2a47a8..0600cf234c 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -110,12 +110,12 @@ class ClimateCall {
   const optional<ClimateFanMode> &get_fan_mode() const;
   const optional<ClimateSwingMode> &get_swing_mode() const;
   const optional<ClimatePreset> &get_preset() const;
+  /// @deprecated Use get_custom_fan_mode() (returns const char*) instead (since 2025.11.0)
+  optional<std::string> get_custom_fan_mode() const;
+  /// @deprecated Use get_custom_preset() (returns const char*) instead (since 2025.11.0)
+  optional<std::string> get_custom_preset() const;
   const char *get_custom_fan_mode() const;
   const char *get_custom_preset() const;
-  /// @deprecated Use get_custom_fan_mode() (returns const char*) instead (since 2025.11.0)
-  optional<std::string> get_custom_fan_mode_optional() const;
-  /// @deprecated Use get_custom_preset() (returns const char*) instead (since 2025.11.0)
-  optional<std::string> get_custom_preset_optional() const;
 
  protected:
   void validate_();
diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h
index e5171867d5..1fba56888f 100644
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -19,6 +19,15 @@ inline bool vector_contains(const std::vector<const char *> &vec, const char *va
   return false;
 }
 
+// Find and return matching pointer from vector, or nullptr if not found
+inline const char *vector_find(const std::vector<const char *> &vec, const char *value) {
+  for (const char *item : vec) {
+    if (strcmp(item, value) == 0)
+      return item;
+  }
+  return nullptr;
+}
+
 // Type aliases for climate enum bitmasks
 // These replace std::set<EnumType> to eliminate red-black tree overhead
 // For contiguous enums starting at 0, DefaultBitPolicy provides 1:1 mapping (enum value = bit position)
@@ -153,11 +162,7 @@ class ClimateTraits {
   }
   /// Find and return the matching custom fan mode pointer from supported modes, or nullptr if not found
   const char *find_custom_fan_mode(const char *custom_fan_mode) const {
-    for (const char *mode : this->supported_custom_fan_modes_) {
-      if (strcmp(mode, custom_fan_mode) == 0)
-        return mode;
-    }
-    return nullptr;
+    return vector_find(this->supported_custom_fan_modes_, custom_fan_mode);
   }
 
   void set_supported_presets(ClimatePresetMask presets) { this->supported_presets_ = presets; }
@@ -184,11 +189,7 @@ class ClimateTraits {
   }
   /// Find and return the matching custom preset pointer from supported presets, or nullptr if not found
   const char *find_custom_preset(const char *custom_preset) const {
-    for (const char *preset : this->supported_custom_presets_) {
-      if (strcmp(preset, custom_preset) == 0)
-        return preset;
-    }
-    return nullptr;
+    return vector_find(this->supported_custom_presets_, custom_preset);
   }
 
   void set_supported_swing_modes(ClimateSwingModeMask modes) { this->supported_swing_modes_ = modes; }