diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5988f8..be9364d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ option(WITH_ASAN "Enable address sanitizer" OFF)
 option(WITH_TSAN "Enable thread sanitizer" OFF)
 
 # CXX flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Weffc++ -Woverloaded-virtual -Wno-non-virtual-dtor -g")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Weffc++ -Woverloaded-virtual -g")
 
 check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP)
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
diff --git a/include/wsrep/client_service.hpp b/include/wsrep/client_service.hpp
index a463977..0f2ec32 100644
--- a/include/wsrep/client_service.hpp
+++ b/include/wsrep/client_service.hpp
@@ -24,7 +24,7 @@ namespace wsrep
     {
     public:
         client_service() { }
-
+        virtual ~client_service() { }
         /**
          * Return true if two pahase commit is required for transaction
          * to commit.
diff --git a/include/wsrep/server_service.hpp b/include/wsrep/server_service.hpp
index a3b9932..3a4cd79 100644
--- a/include/wsrep/server_service.hpp
+++ b/include/wsrep/server_service.hpp
@@ -30,6 +30,7 @@ namespace wsrep
     {
     public:
 
+        virtual ~server_service() { }
         virtual wsrep::storage_service* storage_service(
             wsrep::client_service&) = 0;