diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js
index de1001615..2a10cb3f4 100644
--- a/apps/documenteditor/forms/app.js
+++ b/apps/documenteditor/forms/app.js
@@ -46,7 +46,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/word/sdk-all-min',
         api             : 'api/documents/api',
diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js
index 5cdc1d891..d85f0b468 100644
--- a/apps/documenteditor/forms/app_dev.js
+++ b/apps/documenteditor/forms/app_dev.js
@@ -46,7 +46,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index 45607f0e9..8e57bd105 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/word/sdk-all-min',
         api             : 'api/documents/api',
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index 93f883f46..fcf7ac26f 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index e5a3e3e8a..52ee654b1 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/slide/sdk-all-min',
         api             : 'api/documents/api',
diff --git a/apps/presentationeditor/main/app.reporter.js b/apps/presentationeditor/main/app.reporter.js
index 4fd41f738..e06d14850 100644
--- a/apps/presentationeditor/main/app.reporter.js
+++ b/apps/presentationeditor/main/app.reporter.js
@@ -48,7 +48,7 @@ require.config({
         jquery          : '../vendor/jquery/jquery.min',
         underscore      : '../vendor/underscore/underscore-min',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/slide/sdk-all-min'
     },
diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
index 74b97e47f..d3765f0d4 100644
--- a/apps/presentationeditor/main/app_dev.js
+++ b/apps/presentationeditor/main/app_dev.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js
index 9dcbaa11d..9334926a1 100644
--- a/apps/presentationeditor/main/app_dev.reporter.js
+++ b/apps/presentationeditor/main/app_dev.reporter.js
@@ -48,7 +48,7 @@ require.config({
         jquery          : '../vendor/jquery/jquery',
         underscore      : '../vendor/underscore/underscore',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts'
     },
     shim: {
diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js
index c7a4626f1..d00247a5f 100644
--- a/apps/spreadsheeteditor/main/app.js
+++ b/apps/spreadsheeteditor/main/app.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         allfonts        : '../../sdkjs/common/AllFonts',
         sdk             : '../../sdkjs/cell/sdk-all-min',
         api             : 'api/documents/api',
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
index b1c5782ed..d807bf1c7 100644
--- a/apps/spreadsheeteditor/main/app_dev.js
+++ b/apps/spreadsheeteditor/main/app_dev.js
@@ -53,7 +53,7 @@ require.config({
         perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
-        socketio        : '../vendor/socketio/socket.io.min.js',
+        socketio        : '../vendor/socketio/socket.io.min',
         api             : 'api/documents/api',
         core            : 'common/main/lib/core/application',
         notification    : 'common/main/lib/core/NotificationCenter',
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index 480ba124c..a5e9b2649 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -281,7 +281,7 @@ module.exports = function(grunt) {
             },
         }
     });
-    doRegisterTask('sockjs');
+    doRegisterTask('socketio');
     doRegisterTask('xregexp');
     doRegisterTask('megapixel');
     doRegisterTask('jquery');
@@ -673,7 +673,7 @@ module.exports = function(grunt) {
     grunt.registerTask('deploy-apps-common',            ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
     grunt.registerTask('deploy-sdk',                    ['sdk-init', 'clean', copyTask]);
 
-    grunt.registerTask('deploy-sockjs',                 ['sockjs-init', 'clean', 'copy']);
+    grunt.registerTask('deploy-socketio',               ['socketio-init', 'clean', 'copy']);
     grunt.registerTask('deploy-xregexp',                ['xregexp-init', 'clean', 'copy']);
     grunt.registerTask('deploy-megapixel',              ['megapixel-init', 'clean', 'copy']);
     grunt.registerTask('deploy-jquery',                 ['jquery-init', 'clean', 'copy']);
diff --git a/build/appforms.json b/build/appforms.json
index 7a2f2ed9c..7750b7b67 100644
--- a/build/appforms.json
+++ b/build/appforms.json
@@ -32,7 +32,7 @@
                         "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
-                        "sockjs": "empty:",
+                        "socketio": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -85,7 +85,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs"
+                                "socketio"
                             ]
                         },
                         "gateway": {
diff --git a/build/bower.json b/build/bower.json
index c99679ee9..e23eff4dc 100644
--- a/build/bower.json
+++ b/build/bower.json
@@ -10,7 +10,7 @@
     "requirejs-text": "~2.0.5",
     "less": "~1.5.0",
     "bootstrap": "~3.0.3",
-    "sockjs": "~0.3.2",
+    "socketio": "~4.5.3",
     "perfect-scrollbar": "latest"
   }
 }
\ No newline at end of file
diff --git a/build/common.json b/build/common.json
index e6dae49ed..238c9e3f9 100644
--- a/build/common.json
+++ b/build/common.json
@@ -180,14 +180,14 @@
             }
         }
     },
-    "sockjs": {
+    "socketio": {
         "clean": [
-            "../deploy/web-apps/vendor/sockjs"
+            "../deploy/web-apps/vendor/socketio"
         ],
         "copy": {
             "script": {
-                "src": "../vendor/sockjs/sockjs.min.js",
-                "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
+                "src": "../vendor/socketio/socket.io.min.js",
+                "dest": "../deploy/web-apps/vendor/socketio/socket.io.min.js"
             }
         }
     },
@@ -272,7 +272,7 @@
             "deploy-api",
             "deploy-apps-common",
             "deploy-sdk",
-            "deploy-sockjs",
+            "deploy-socketio",
             "deploy-xregexp",
             "deploy-requirejs",
             "deploy-megapixel",
diff --git a/build/documenteditor.json b/build/documenteditor.json
index 86d0f48ce..3ebde78d9 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -30,7 +30,7 @@
                         "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
-                        "sockjs": "empty:",
+                        "socketio": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -83,7 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs"
+                                "socketio"
                             ]
                         },
                         "gateway": {
diff --git a/build/presentationeditor.json b/build/presentationeditor.json
index f66c8b22f..d7b9d1279 100644
--- a/build/presentationeditor.json
+++ b/build/presentationeditor.json
@@ -30,7 +30,7 @@
                         "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
-                        "sockjs": "empty:",
+                        "socketio": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -83,7 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs"
+                                "socketio"
                             ]
                         },
                         "gateway": {
diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json
index df58fe594..1ec8adb39 100644
--- a/build/spreadsheeteditor.json
+++ b/build/spreadsheeteditor.json
@@ -30,7 +30,7 @@
                         "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
-                        "sockjs": "empty:",
+                        "socketio": "empty:",
                         "coapisettings": "empty:",
                         "allfonts": "empty:",
                         "sdk": "empty:",
@@ -83,7 +83,7 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
-                                "sockjs"
+                                "socketio"
                             ]
                         },
                         "gateway": {
diff --git a/test/documenteditor/main/index.html b/test/documenteditor/main/index.html
index b1ef1a729..e31e3fcf6 100644
--- a/test/documenteditor/main/index.html
+++ b/test/documenteditor/main/index.html
@@ -77,7 +77,7 @@
       <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
       <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
 
-      <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
+      <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
 
       <script src="../../../vendor/requirejs/require.js"></script>
diff --git a/test/presentationeditor/main/index.html b/test/presentationeditor/main/index.html
index 4ee99595f..39f61c785 100644
--- a/test/presentationeditor/main/index.html
+++ b/test/presentationeditor/main/index.html
@@ -147,7 +147,7 @@
 <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
 <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
 <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
-<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
+<script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
 <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
 
 <script src="../../../vendor/requirejs/require.js"></script>
diff --git a/test/spreadsheeteditor/main/index.html b/test/spreadsheeteditor/main/index.html
index 9ee008707..f5da45b3b 100644
--- a/test/spreadsheeteditor/main/index.html
+++ b/test/spreadsheeteditor/main/index.html
@@ -113,7 +113,7 @@
         <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
         <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
 
-        <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
+        <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
         <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
         <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
         <script src="../../../vendor/requirejs/require.js"></script>