diff --git a/mongodbw/src/main/java/com/arcadedb/mongo/query/MongoQueryEngine.java b/mongodbw/src/main/java/com/arcadedb/mongo/query/MongoQueryEngine.java
index 5b774651fd..2e83152d20 100644
--- a/mongodbw/src/main/java/com/arcadedb/mongo/query/MongoQueryEngine.java
+++ b/mongodbw/src/main/java/com/arcadedb/mongo/query/MongoQueryEngine.java
@@ -71,13 +71,20 @@ public ResultSet query(final String query, ContextConfiguration configuration, f
     return query(query, null, (Map) null);
   }
 
+  // TODO: This command method can only handle queries, a command method needs to be provided in mongoDBWrapper
   @Override
   public ResultSet command(final String query, ContextConfiguration configuration, final Map<String, Object> parameters) {
-    return null;
+    try {
+      return mongoDBWrapper.query(query);
+    } catch (final Exception e) {
+      LogManager.instance().log(this, Level.SEVERE, "Error on initializing Mongo query engine", e);
+      throw new CommandParsingException("Error on initializing Mongo query engine", e);
+    }
   }
 
+  // TODO: This command method can only handle queries, a command method needs to be provided in mongoDBWrapper
   @Override
   public ResultSet command(final String query, ContextConfiguration configuration, final Object... parameters) {
-    return null;
+    return query(query, null, (Map) null);
   }
 }