diff --git a/WORKSPACE b/WORKSPACE
index 9b123eeab2af..ea8180d15b74 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -30,7 +30,7 @@ bind(
 )
 
 # When updating envoy sha manually please update the sha in istio.deps file also
-ENVOY_SHA = "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"
+ENVOY_SHA = "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"
 
 http_archive(
     name = "envoy",
diff --git a/istio.deps b/istio.deps
index 7ce8746741ea..3a8e9814afa3 100644
--- a/istio.deps
+++ b/istio.deps
@@ -11,6 +11,6 @@
 		"name": "ENVOY_SHA",
 		"repoName": "envoyproxy/envoy",
 		"file": "WORKSPACE",
-		"lastStableSHA": "01d2e16e973a76cc05f5e9e5c7a74f73498bc6c2"
+		"lastStableSHA": "3b05bffcbaedaf6d112ba38ad58121ba5aa5af51"
 	}
 ]
diff --git a/src/envoy/http/mixer/report_data.h b/src/envoy/http/mixer/report_data.h
index 8b625d4b4c83..b3c8ee0a38be 100644
--- a/src/envoy/http/mixer/report_data.h
+++ b/src/envoy/http/mixer/report_data.h
@@ -100,7 +100,7 @@ class ReportData : public ::istio::control::http::ReportData {
 
   bool GetDestinationUID(std::string *uid) const override {
     if (info_.upstreamHost()) {
-      return Utils::GetDestinationUID(*info_.upstreamHost()->metadata(), uid);
+      return Utils::GetDestinationUID(info_.upstreamHost()->metadata(), uid);
     }
     return false;
   }
diff --git a/src/envoy/tcp/mixer/filter.cc b/src/envoy/tcp/mixer/filter.cc
index 105db9d19b69..3081c31f2d56 100644
--- a/src/envoy/tcp/mixer/filter.cc
+++ b/src/envoy/tcp/mixer/filter.cc
@@ -173,7 +173,7 @@ bool Filter::GetDestinationIpPort(std::string* str_ip, int* port) const {
 bool Filter::GetDestinationUID(std::string* uid) const {
   if (filter_callbacks_->upstreamHost()) {
     return Utils::GetDestinationUID(
-        *filter_callbacks_->upstreamHost()->metadata(), uid);
+        filter_callbacks_->upstreamHost()->metadata(), uid);
   }
   return false;
 }