diff --git a/command/open_session.cpp b/command/open_session.cpp
index 2eb273f..5b0800f 100644
--- a/command/open_session.cpp
+++ b/command/open_session.cpp
@@ -39,7 +39,8 @@
     }
 
     // Check for valid Confidentiality Algorithms
-    if (request->confAlgo != 0)
+    if(!cipher::crypt::Interface::isAlgorithmSupported(static_cast
+                    <cipher::crypt::Algorithms>(request->confAlgo)))
     {
         response->status_code =
             static_cast<uint8_t>(RAKP_ReturnCode::INVALID_CONF_ALGO);
diff --git a/crypt_algo.hpp b/crypt_algo.hpp
index 6e22cf0..d1e3940 100644
--- a/crypt_algo.hpp
+++ b/crypt_algo.hpp
@@ -80,6 +80,26 @@
          */
         virtual buffer encryptPayload(buffer& payload) const = 0;
 
+        /**
+         * @brief Check if the Confidentiality algorithm is supported
+         *
+         * @param[in] algo - confidentiality algorithm
+         *
+         * @return true if algorithm is supported else false
+         *
+         */
+        static bool isAlgorithmSupported(Algorithms algo)
+        {
+            if (algo == Algorithms::NONE || algo == Algorithms::AES_CBC_128)
+            {
+               return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
     protected:
 
         /**