diff --git a/CHANGES.md b/CHANGES.md
index 3745051df..ca1581f50 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 0.5.5 (2018-04-xx)
+
+* Fix panic when Websocket is closed with no error code #191
+
+
 ## 0.5.4 (2018-04-19)
 
 * Add identity service middleware
diff --git a/Cargo.toml b/Cargo.toml
index fe83dc977..78c0d723b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "0.5.4"
+version = "0.5.5"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
diff --git a/src/ws/mod.rs b/src/ws/mod.rs
index f79f3f77a..06b771126 100644
--- a/src/ws/mod.rs
+++ b/src/ws/mod.rs
@@ -310,10 +310,11 @@ where
                     }
                     OpCode::Close => {
                         self.closed = true;
-                        let close_code = if payload.len() >= 2{
-                            let raw_code = NetworkEndian::read_uint(payload.as_ref(), 2) as u16;
+                        let close_code = if payload.len() >= 2 {
+                            let raw_code =
+                                NetworkEndian::read_uint(payload.as_ref(), 2) as u16;
                             CloseCode::from(raw_code)
-                        }else{
+                        } else {
                             CloseCode::Status
                         };