diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 88d1cd6711..f6d5950a02 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -175,7 +175,7 @@ void wxBitmapComboBox::RecreateControl()
         if ( !objectClientData.empty() )
             SetClientObject(i, objectClientData[i]);
         else if ( !voidClientData.empty() )
-            SetClientData(i, objectClientData[i]);
+            SetClientData(i, voidClientData[i]);
     }
 
     // and make sure it has the same attributes as before