diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 30484a41087..eaa3e51ca67 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -262,7 +262,7 @@ static int example_init_func(void *p)
   example_hton->table_options= example_table_option_list;
   example_hton->field_options= example_field_option_list;
   example_hton->tablefile_extensions= ha_example_exts;
-  example_hton->drop_table= [](handlerton *, const char*) { return 0; };
+  example_hton->drop_table= [](handlerton *, const char*) { return -1; };
 
   DBUG_RETURN(0);
 }
diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc
index 79cec499a77..11bb139fd55 100644
--- a/storage/oqgraph/ha_oqgraph.cc
+++ b/storage/oqgraph/ha_oqgraph.cc
@@ -192,7 +192,7 @@ static int oqgraph_init(void *p)
   hton->discover_table_structure= oqgraph_discover_table_structure;
 
   hton->close_connection = oqgraph_close_connection;
-  hton->drop_table= [](handlerton *, const char*) { return 0; };
+  hton->drop_table= [](handlerton *, const char*) { return -1; };
 
   oqgraph_init_done= TRUE;
   return 0;
diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
index 49639c278d0..930d65afc53 100644
--- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
+++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
@@ -30,3 +30,14 @@ update graph set origid=123;
 ERROR HY000: Table 'graph' is read only
 DROP TABLE graph_base;
 DROP TABLE graph;
+#
+# End of 10.0 tests
+#
+#
+# MDEV-25373 DROP TABLE doesn't raise error while dropping non-existing table in MariaDB 10.5.9 when OQGraph SE is loaded to the server
+#
+drop table foobar;
+ERROR 42S02: Unknown table 'test.foobar'
+#
+# End of 10.5 tests
+#
diff --git a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
index cab99ec5018..24351cc9998 100644
--- a/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
+++ b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
@@ -48,3 +48,16 @@ update graph set origid=123;
 DROP TABLE graph_base;
 DROP TABLE graph;
 
+--echo #
+--echo # End of 10.0 tests
+--echo #
+
+--echo #
+--echo # MDEV-25373 DROP TABLE doesn't raise error while dropping non-existing table in MariaDB 10.5.9 when OQGraph SE is loaded to the server
+--echo #
+--error 1051
+drop table foobar;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #