diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.h
@@ -12,12 +12,14 @@
   static std::once_flag initialized;
 
   static void setDatabaseStatusAsWorkable();
+  static void indicateQueryExecutorCreation();
 
 public:
   static const DatabaseQueryExecutor &getQueryExecutor();
   static void clearSensitiveData();
   static void initializeQueryExecutor(std::string &databasePath);
   static bool checkIfDatabaseNeedsDeletion();
+  static void reportDBOperationsFailure();
 };
 
 } // namespace comm
diff --git a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
--- a/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
+++ b/native/cpp/CommonCpp/DatabaseManagers/DatabaseManager.cpp
@@ -11,6 +11,7 @@
 DatabaseManagerStatus DB_MANAGER_WORKABLE = "WORKABLE";
 DatabaseManagerStatus DB_MANAGER_FIRST_FAILURE = "FIRST_FAILURE";
 DatabaseManagerStatus DB_MANAGER_SECOND_FAILURE = "SECOND_FAILURE";
+DatabaseManagerStatus DB_OPERATIONS_FAILURE = "DB_OPERATIONS_FAILURE";
 
 const std::string DATABASE_MANAGER_STATUS_KEY = "DATABASE_MANAGER_STATUS";
 
@@ -22,7 +23,7 @@
   // creating an instance means that migration code was executed
   // and finished without error and database is workable
   std::call_once(DatabaseManager::initialized, []() {
-    DatabaseManager::setDatabaseStatusAsWorkable();
+    DatabaseManager::indicateQueryExecutorCreation();
   });
   return instance;
 }
@@ -37,7 +38,7 @@
   try {
     SQLiteQueryExecutor::initialize(databasePath);
     DatabaseManager::getQueryExecutor();
-    commSecureStore.set(DATABASE_MANAGER_STATUS_KEY, DB_MANAGER_WORKABLE);
+    DatabaseManager::indicateQueryExecutorCreation();
     Logger::log("Database manager initialized");
   } catch (...) {
     folly::Optional<std::string> databaseManagerStatus =
@@ -65,12 +66,31 @@
   commSecureStore.set(DATABASE_MANAGER_STATUS_KEY, DB_MANAGER_WORKABLE);
 }
 
+void DatabaseManager::indicateQueryExecutorCreation() {
+  comm::CommSecureStore commSecureStore{};
+  folly::Optional<std::string> databaseManagerStatus =
+      commSecureStore.get(DATABASE_MANAGER_STATUS_KEY);
+  if (!databaseManagerStatus.hasValue() ||
+      databaseManagerStatus.value() != DB_OPERATIONS_FAILURE) {
+    // creating query executor means that schema was created without error,
+    // but this doesn't imply that schema has a proper structure,
+    // and operation will not crash, this case should not be overridden
+    commSecureStore.set(DATABASE_MANAGER_STATUS_KEY, DB_MANAGER_WORKABLE);
+  }
+}
+
 bool DatabaseManager::checkIfDatabaseNeedsDeletion() {
   comm::CommSecureStore commSecureStore{};
   folly::Optional<std::string> databaseManagerStatus =
       commSecureStore.get(DATABASE_MANAGER_STATUS_KEY);
   return databaseManagerStatus.hasValue() &&
-      databaseManagerStatus.value() == DB_MANAGER_SECOND_FAILURE;
+      (databaseManagerStatus.value() == DB_MANAGER_SECOND_FAILURE ||
+       databaseManagerStatus.value() == DB_OPERATIONS_FAILURE);
+}
+
+void DatabaseManager::reportDBOperationsFailure() {
+  comm::CommSecureStore commSecureStore{};
+  commSecureStore.set(DATABASE_MANAGER_STATUS_KEY, DB_OPERATIONS_FAILURE);
 }
 
 } // namespace comm