diff --git a/java/src/main/java/monasca/api/app/command/CreateMetricCommand.java b/java/src/main/java/monasca/api/app/command/CreateMetricCommand.java
index a3263aae8..4fc76b95e 100644
--- a/java/src/main/java/monasca/api/app/command/CreateMetricCommand.java
+++ b/java/src/main/java/monasca/api/app/command/CreateMetricCommand.java
@@ -1,11 +1,11 @@
 /*
  * Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
@@ -121,7 +121,7 @@ public class CreateMetricCommand {
     return new Metric(name, dimensions, timestamp, value, valueMeta);
   }
 
-  public void validate() {
+  public void validate(boolean validateTimestamp) {
     // Validate name and dimensions
     MetricNameValidation.validate(name, true);
     if (dimensions != null) {
@@ -132,6 +132,8 @@ public class CreateMetricCommand {
     }
 
     // Validate times and values
-    validateTimestamp(timestamp);
+    if (validateTimestamp) {
+      validateTimestamp(timestamp);
+    }
   }
 }
diff --git a/java/src/main/java/monasca/api/resource/MetricResource.java b/java/src/main/java/monasca/api/resource/MetricResource.java
index da91aa0cb..ba6635b1c 100644
--- a/java/src/main/java/monasca/api/resource/MetricResource.java
+++ b/java/src/main/java/monasca/api/resource/MetricResource.java
@@ -92,6 +92,10 @@ public class MetricResource {
         isDelegate =
         !Strings.isNullOrEmpty(roles) && COMMA_SPLITTER.splitToList(roles)
             .contains(monitoring_delegate_role);
+    boolean
+        isAdmin =
+        !Strings.isNullOrEmpty(roles) && COMMA_SPLITTER.splitToList(roles)
+            .contains(admin_role);
     List<Metric> metrics = new ArrayList<>(commands.length);
     for (CreateMetricCommand command : commands) {
       if (!isDelegate) {
@@ -106,8 +110,8 @@ public class MetricResource {
           throw Exceptions.forbidden("Project %s cannot POST cross tenant metrics", tenantId);
         }
       }
+      command.validate(!isAdmin);
 
-      command.validate();
       metrics.add(command.toMetric());
     }