diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 894cc6a3df9..f0b2c56b5fe 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -2835,8 +2835,8 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
             created_font = TRUE;
         }
     } else {
-        font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0);
-        hPrevFont = SelectObject(hDC, font);
+        if (infoPtr->font)
+            SelectObject(hDC, infoPtr->font);
     }
 
     GetClientRect(infoPtr->hwnd, &bgRect);