diff --git a/server/Flask/queries.py b/server/Flask/queries.py
index 0211c8d..c423711 100644
--- a/server/Flask/queries.py
+++ b/server/Flask/queries.py
@@ -13,6 +13,8 @@ def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd):
                WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';'''
  elif node and dataType:
     query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'"
+ elif MAC == "*":
+      query = "SELECT * FROM Node"
  elif node:
     query = f"SELECT * FROM Measurement WHERE NodeID = {node}"
  elif dataType: