diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 2bc3f846a3..c37bcce941 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -528,13 +528,6 @@ if (is_linux || is_win) {
         "-Wno-sentinel",
       ]
     }
-
-    if (is_clang) {
-      # TODO(ehmaldonado): Make peerconnection_client compile with the standard
-      # set of warnings.
-      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6306
-      cflags += [ "-Wno-inconsistent-missing-override" ]
-    }
   }
 
   rtc_executable("peerconnection_client") {
diff --git a/examples/peerconnection/client/conductor.h b/examples/peerconnection/client/conductor.h
index ebd2b6baed..e42949b762 100644
--- a/examples/peerconnection/client/conductor.h
+++ b/examples/peerconnection/client/conductor.h
@@ -48,7 +48,7 @@ class Conductor
 
   bool connection_active() const;
 
-  virtual void Close();
+  void Close() override;
 
  protected:
   ~Conductor();
diff --git a/examples/peerconnection/client/linux/main.cc b/examples/peerconnection/client/linux/main.cc
index c074d7c238..200d487e34 100644
--- a/examples/peerconnection/client/linux/main.cc
+++ b/examples/peerconnection/client/linux/main.cc
@@ -32,7 +32,7 @@ class CustomSocketServer : public rtc::PhysicalSocketServer {
   void set_conductor(Conductor* conductor) { conductor_ = conductor; }
 
   // Override so that we can also pump the GTK message loop.
-  virtual bool Wait(int cms, bool process_io) {
+  bool Wait(int cms, bool process_io) override {
     // Pump GTK events.
     // TODO(henrike): We really should move either the socket server or UI to a
     // different thread.  Alternatively we could look at merging the two loops