diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp
index 7cffc3748bb..0072d4603e8 100644
--- a/base/applications/rapps/appview.cpp
+++ b/base/applications/rapps/appview.cpp
@@ -2047,8 +2047,6 @@ BOOL CApplicationView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAp
 
 VOID CApplicationView::SetWatermark(const CStringW& Text)
 {
-    ATLASSERT(GetItemCount() == 0);
-
     m_ListView->SetWatermark(Text);
 }
 
diff --git a/base/applications/rapps/include/rapps.h b/base/applications/rapps/include/rapps.h
index 595cf24e76e..ca31dd2e16b 100644
--- a/base/applications/rapps/include/rapps.h
+++ b/base/applications/rapps/include/rapps.h
@@ -1,6 +1,10 @@
 #ifndef _RAPPS_H
 #define _RAPPS_H
 
+#if DBG && !defined(_DEBUG)
+    #define _DEBUG  // CORE-17505
+#endif
+
 #include "defines.h"
 
 #include "dialogs.h"