diff --git a/ma_statement.c b/ma_statement.c
index ef16cb9..552c90b 100644
--- a/ma_statement.c
+++ b/ma_statement.c
@@ -93,6 +93,21 @@ SQLRETURN MADB_ExecuteQuery(MADB_Stmt * Stmt, char *StatementText, SQLINTEGER Te
       MADB_CLEAR_ERROR(&Stmt->Error);
 
       Stmt->AffectedRows= mysql_affected_rows(Stmt->Connection->mariadb);
+      if (Stmt->Query.BatchAllowed || !Stmt->Query.ReturnsResult)
+      {
+        while (mysql_more_results(Stmt->Connection->mariadb))
+        {
+          if (mysql_next_result(Stmt->Connection->mariadb))
+          {
+            MADB_SetNativeError(&Stmt->Error, SQL_HANDLE_DBC, Stmt->Connection->mariadb);
+            ret = SQL_ERROR;
+
+            break;
+          }
+          else
+            Stmt->AffectedRows += mysql_affected_rows(Stmt->Connection->mariadb);
+        }
+      }
     }
     else
     {