diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json
index 2ecb22c0..b5223b05 100644
--- a/myems-api/MyEMS.postman_collection.json
+++ b/myems-api/MyEMS.postman_collection.json
@@ -11133,7 +11133,14 @@
 							"query": [
 								{
 									"key": "meterid",
-									"value": "6"
+									"value": "6",
+									"description": "use meter id or meteruuid"
+								},
+								{
+									"key": "meteruuid",
+									"value": "5ca47bc5-22c2-47fc-b906-33222191ea40",
+									"description": "use meter id or meteruuid",
+									"disabled": true
 								},
 								{
 									"key": "periodtype",
diff --git a/myems-api/README.md b/myems-api/README.md
index 95c7e8f1..c39a0a61 100644
--- a/myems-api/README.md
+++ b/myems-api/README.md
@@ -2310,7 +2310,7 @@ curl -i -X GET {{base_url}}/reports/meterbatch?spaceid=1&reportingperiodstartdat
 ```bash
 curl -i -X GET {{base_url}}/reports/metercost?meterid=6&periodtype=daily&baseperiodstartdatetime=2020-08-01T00:00:00&baseperiodenddatetime=2020-09-01T00:00:00&reportingperiodstartdatetime=2020-09-01T00:00:00&reportingperiodenddatetime=2020-10-01T00:00:00
 ```
-*   GET Meter Energy Report
+* GET Meter Energy Report
 ```bash
 curl -i -X GET {{base_url}}/reports/meterenergy?meterid=6&periodtype=daily&baseperiodstartdatetime=2020-08-01T00:00:00&baseperiodenddatetime=2020-09-01T00:00:00&reportingperiodstartdatetime=2020-09-01T00:00:00&reportingperiodenddatetime=2020-10-01T00:00:00
 ```
diff --git a/myems-api/reports/meterenergy.py b/myems-api/reports/meterenergy.py
index f5fd3d00..732fd1dd 100644
--- a/myems-api/reports/meterenergy.py
+++ b/myems-api/reports/meterenergy.py
@@ -6,6 +6,7 @@ from datetime import datetime, timedelta, timezone
 from core import utilities
 from decimal import Decimal
 import excelexporters.meterenergy
+import re
 
 
 class Reporting:
@@ -32,6 +33,7 @@ class Reporting:
     @staticmethod
     def on_get(req, resp):
         print(req.params)
+        # this procedure accepts meter id or meter uuid to identify a meter
         meter_id = req.params.get('meterid')
         meter_uuid = req.params.get('meteruuid')
         period_type = req.params.get('periodtype')
@@ -53,6 +55,10 @@ class Reporting:
 
         if meter_uuid is not None:
             meter_uuid = str.strip(meter_uuid)
+            regex = re.compile('^[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}\Z', re.I)
+            match = regex.match(meter_uuid)
+            if not bool(match):
+                raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_METER_UUID')
 
         if period_type is None:
             raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PERIOD_TYPE')
@@ -142,7 +148,7 @@ class Reporting:
                                   " FROM tbl_meters m, tbl_energy_categories ec "
                                   " WHERE m.id = %s AND m.energy_category_id = ec.id ", (meter_id,))
             row_meter = cursor_system.fetchone()
-        if meter_uuid is not None:
+        elif meter_uuid is not None:
             cursor_system.execute(" SELECT m.id, m.name, m.cost_center_id, m.energy_category_id, "
                                   "        ec.name, ec.unit_of_measure, ec.kgce, ec.kgco2e "
                                   " FROM tbl_meters m, tbl_energy_categories ec "