diff --git a/dlls/msi/database.c b/dlls/msi/database.c
index 4537ed5836e..19926619225 100644
--- a/dlls/msi/database.c
+++ b/dlls/msi/database.c
@@ -1993,17 +1993,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle )
 
     TRACE("%d\n", handle);
 
-    db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE );
-    if( !db )
-    {
-        MSIHANDLE remote_database = msi_get_remote(handle);
-        if ( !remote_database )
-            return MSIDBSTATE_ERROR;
-
-        WARN("MsiGetDatabaseState not allowed during a custom action!\n");
-
-        return MSIDBSTATE_READ;
-    }
+    if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE )))
+        return MSIDBSTATE_ERROR;
 
     if (db->mode != MSIDBOPEN_READONLY )
         ret = MSIDBSTATE_WRITE;
diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c
index 6ae5bfc30a9..9e9e2bf938a 100644
--- a/dlls/msi/tests/custom.c
+++ b/dlls/msi/tests/custom.c
@@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
     UINT r;
 
     r = MsiGetDatabaseState(hinst);
-    todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
+    ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
 
     db = MsiGetActiveDatabase(hinst);
     ok(hinst, db, "MsiGetActiveDatabase failed\n");
@@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst)
     ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);
 
     r = MsiGetDatabaseState(db);
-    todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
+    ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r);
 
     r = MsiEnableUIPreview(db, &preview);
     todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);