diff --git a/reactos/win32ss/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c
index a38338e4166..32bbfc2dd25 100644
--- a/reactos/win32ss/gdi/ntgdi/dclife.c
+++ b/reactos/win32ss/gdi/ntgdi/dclife.c
@@ -179,9 +179,6 @@ DC_vInitDc(
         /* Non-direct DCs don't have a surface by default */
         pdc->dclevel.pSurface = NULL;
 
-        // FIXME: HACK, because our code expects a surface
-        // pdc->dclevel.pSurface = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]);
-
         pdc->erclBounds.left = 0;
         pdc->erclBounds.top = 0;
         pdc->erclBounds.right = 0;
@@ -794,9 +791,6 @@ NtGdiCreateCompatibleDC(HDC hdc)
     /* Allocate a dc attribute */
     DC_bAllocDcAttr(pdcNew);
 
-    // HACK!
-    //DC_vSelectSurface(pdcNew, psurfDefaultBitmap);
-
     DC_UnlockDc(pdcNew);
 
     DPRINT("Leave NtGdiCreateCompatibleDC hdcNew = %p\n", hdcNew);
diff --git a/reactos/win32ss/gdi/ntgdi/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c
index a9b2b6cf696..6637742fed8 100644
--- a/reactos/win32ss/gdi/ntgdi/dcobjs.c
+++ b/reactos/win32ss/gdi/ntgdi/dcobjs.c
@@ -382,9 +382,6 @@ NtGdiSelectBitmap(
         /* Default bitmap is 1x1 pixel */
         pdc->dclevel.sizl.cx = 1;
         pdc->dclevel.sizl.cy = 1;
-
-        // HACK
-        //psurfNew = SURFACE_ShareLockSurface(hbmp);
     }
     else
     {
@@ -572,7 +569,7 @@ NtGdiGetDCObject(HDC hDC, INT ObjectType)
         case GDI_OBJECT_TYPE_BITMAP:
         {
             SURFACE *psurf = pdc->dclevel.pSurface;
-            SelObject = psurf ? psurf->BaseObject.hHmgr : NULL;
+            SelObject = psurf ? psurf->BaseObject.hHmgr : StockObjects[DEFAULT_BITMAP];
             break;
         }