diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index c1ef5b461f..71cc3ad5f8 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -587,6 +587,7 @@ void wxVListBoxComboPopup::ClearClientDatas()
     }
 
     m_clientDatas.Empty();
+    m_clientDataItemsType = wxClientData_None;
 }
 
 void wxVListBoxComboPopup::SetItemClientData( unsigned int n,
@@ -998,6 +999,7 @@ void wxOwnerDrawnComboBox::DoClear()
 void wxOwnerDrawnComboBox::Clear()
 {
     DoClear();
+    SetClientDataType(wxClientData_None);
 }
 
 void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)