diff --git a/poetry.lock b/poetry.lock
index a28341494b..bcc16288a5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -429,10 +429,6 @@ files = [
     {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a37b8f0391212d29b3a91a799c8e4a2855e0576911cdfb2515487e30e322253d"},
     {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e84799f09591700a4154154cab9787452925578841a94321d5ee8fb9a9a328f0"},
     {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f66b5337fa213f1da0d9000bc8dc0cb5b896b726eefd9c6046f699b169c41b9e"},
-    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:5dab0844f2cf82be357a0eb11a9087f70c5430b2c241493fc122bb6f2bb0917c"},
-    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e4fe605b917c70283db7dfe5ada75e04561479075761a0b3866c081d035b01c1"},
-    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:1e9a65b5736232e7a7f91ff3d02277f11d339bf34099a56cdab6a8b3410a02b2"},
-    {file = "Brotli-1.1.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:58d4b711689366d4a03ac7957ab8c28890415e267f9b6589969e74b6e42225ec"},
     {file = "Brotli-1.1.0-cp310-cp310-win32.whl", hash = "sha256:be36e3d172dc816333f33520154d708a2657ea63762ec16b62ece02ab5e4daf2"},
     {file = "Brotli-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:0c6244521dda65ea562d5a69b9a26120769b7a9fb3db2fe9545935ed6735b128"},
     {file = "Brotli-1.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a3daabb76a78f829cafc365531c972016e4aa8d5b4bf60660ad8ecee19df7ccc"},
@@ -445,14 +441,8 @@ files = [
     {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:19c116e796420b0cee3da1ccec3b764ed2952ccfcc298b55a10e5610ad7885f9"},
     {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:510b5b1bfbe20e1a7b3baf5fed9e9451873559a976c1a78eebaa3b86c57b4265"},
     {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a1fd8a29719ccce974d523580987b7f8229aeace506952fa9ce1d53a033873c8"},
-    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c247dd99d39e0338a604f8c2b3bc7061d5c2e9e2ac7ba9cc1be5a69cb6cd832f"},
-    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:1b2c248cd517c222d89e74669a4adfa5577e06ab68771a529060cf5a156e9757"},
-    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:2a24c50840d89ded6c9a8fdc7b6ed3692ed4e86f1c4a4a938e1e92def92933e0"},
-    {file = "Brotli-1.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f31859074d57b4639318523d6ffdca586ace54271a73ad23ad021acd807eb14b"},
     {file = "Brotli-1.1.0-cp311-cp311-win32.whl", hash = "sha256:39da8adedf6942d76dc3e46653e52df937a3c4d6d18fdc94a7c29d263b1f5b50"},
     {file = "Brotli-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:aac0411d20e345dc0920bdec5548e438e999ff68d77564d5e9463a7ca9d3e7b1"},
-    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:32d95b80260d79926f5fab3c41701dbb818fde1c9da590e77e571eefd14abe28"},
-    {file = "Brotli-1.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b760c65308ff1e462f65d69c12e4ae085cff3b332d894637f6273a12a482d09f"},
     {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409"},
     {file = "Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2"},
     {file = "Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451"},
@@ -463,24 +453,8 @@ files = [
     {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180"},
     {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248"},
     {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:87a3044c3a35055527ac75e419dfa9f4f3667a1e887ee80360589eb8c90aabb9"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:c5529b34c1c9d937168297f2c1fde7ebe9ebdd5e121297ff9c043bdb2ae3d6fb"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ca63e1890ede90b2e4454f9a65135a4d387a4585ff8282bb72964fab893f2111"},
-    {file = "Brotli-1.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e79e6520141d792237c70bcd7a3b122d00f2613769ae0cb61c52e89fd3443839"},
     {file = "Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0"},
     {file = "Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951"},
-    {file = "Brotli-1.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8bf32b98b75c13ec7cf774164172683d6e7891088f6316e54425fde1efc276d5"},
-    {file = "Brotli-1.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7bc37c4d6b87fb1017ea28c9508b36bbcb0c3d18b4260fcdf08b200c74a6aee8"},
-    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0ef38c7a7014ffac184db9e04debe495d317cc9c6fb10071f7fefd93100a4f"},
-    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91d7cc2a76b5567591d12c01f019dd7afce6ba8cba6571187e21e2fc418ae648"},
-    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a93dde851926f4f2678e704fadeb39e16c35d8baebd5252c9fd94ce8ce68c4a0"},
-    {file = "Brotli-1.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f0db75f47be8b8abc8d9e31bc7aad0547ca26f24a54e6fd10231d623f183d089"},
-    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6967ced6730aed543b8673008b5a391c3b1076d834ca438bbd70635c73775368"},
-    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7eedaa5d036d9336c95915035fb57422054014ebdeb6f3b42eac809928e40d0c"},
-    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d487f5432bf35b60ed625d7e1b448e2dc855422e87469e3f450aa5552b0eb284"},
-    {file = "Brotli-1.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:832436e59afb93e1836081a20f324cb185836c617659b07b129141a8426973c7"},
-    {file = "Brotli-1.1.0-cp313-cp313-win32.whl", hash = "sha256:43395e90523f9c23a3d5bdf004733246fba087f2948f87ab28015f12359ca6a0"},
-    {file = "Brotli-1.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:9011560a466d2eb3f5a6e4929cf4a09be405c64154e12df0dd72713f6500e32b"},
     {file = "Brotli-1.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a090ca607cbb6a34b0391776f0cb48062081f5f60ddcce5d11838e67a01928d1"},
     {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2de9d02f5bda03d27ede52e8cfe7b865b066fa49258cbab568720aa5be80a47d"},
     {file = "Brotli-1.1.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2333e30a5e00fe0fe55903c8832e08ee9c3b1382aacf4db26664a16528d51b4b"},
@@ -490,10 +464,6 @@ files = [
     {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:fd5f17ff8f14003595ab414e45fce13d073e0762394f957182e69035c9f3d7c2"},
     {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:069a121ac97412d1fe506da790b3e69f52254b9df4eb665cd42460c837193354"},
     {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e93dfc1a1165e385cc8239fab7c036fb2cd8093728cbd85097b284d7b99249a2"},
-    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_aarch64.whl", hash = "sha256:aea440a510e14e818e67bfc4027880e2fb500c2ccb20ab21c7a7c8b5b4703d75"},
-    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_i686.whl", hash = "sha256:6974f52a02321b36847cd19d1b8e381bf39939c21efd6ee2fc13a28b0d99348c"},
-    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_ppc64le.whl", hash = "sha256:a7e53012d2853a07a4a79c00643832161a910674a893d296c9f1259859a289d2"},
-    {file = "Brotli-1.1.0-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:d7702622a8b40c49bffb46e1e3ba2e81268d5c04a34f460978c6b5517a34dd52"},
     {file = "Brotli-1.1.0-cp36-cp36m-win32.whl", hash = "sha256:a599669fd7c47233438a56936988a2478685e74854088ef5293802123b5b2460"},
     {file = "Brotli-1.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d143fd47fad1db3d7c27a1b1d66162e855b5d50a89666af46e1679c496e8e579"},
     {file = "Brotli-1.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:11d00ed0a83fa22d29bc6b64ef636c4552ebafcef57154b4ddd132f5638fbd1c"},
@@ -505,10 +475,6 @@ files = [
     {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:919e32f147ae93a09fe064d77d5ebf4e35502a8df75c29fb05788528e330fe74"},
     {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:23032ae55523cc7bccb4f6a0bf368cd25ad9bcdcc1990b64a647e7bbcce9cb5b"},
     {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:224e57f6eac61cc449f498cc5f0e1725ba2071a3d4f48d5d9dffba42db196438"},
-    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:cb1dac1770878ade83f2ccdf7d25e494f05c9165f5246b46a621cc849341dc01"},
-    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:3ee8a80d67a4334482d9712b8e83ca6b1d9bc7e351931252ebef5d8f7335a547"},
-    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_ppc64le.whl", hash = "sha256:5e55da2c8724191e5b557f8e18943b1b4839b8efc3ef60d65985bcf6f587dd38"},
-    {file = "Brotli-1.1.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:d342778ef319e1026af243ed0a07c97acf3bad33b9f29e7ae6a1f68fd083e90c"},
     {file = "Brotli-1.1.0-cp37-cp37m-win32.whl", hash = "sha256:587ca6d3cef6e4e868102672d3bd9dc9698c309ba56d41c2b9c85bbb903cdb95"},
     {file = "Brotli-1.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2954c1c23f81c2eaf0b0717d9380bd348578a94161a65b3a2afc62c86467dd68"},
     {file = "Brotli-1.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:efa8b278894b14d6da122a72fefcebc28445f2d3f880ac59d46c90f4c13be9a3"},
@@ -521,10 +487,6 @@ files = [
     {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ab4fbee0b2d9098c74f3057b2bc055a8bd92ccf02f65944a241b4349229185a"},
     {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:141bd4d93984070e097521ed07e2575b46f817d08f9fa42b16b9b5f27b5ac088"},
     {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fce1473f3ccc4187f75b4690cfc922628aed4d3dd013d047f95a9b3919a86596"},
-    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d2b35ca2c7f81d173d2fadc2f4f31e88cc5f7a39ae5b6db5513cf3383b0e0ec7"},
-    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:af6fa6817889314555aede9a919612b23739395ce767fe7fcbea9a80bf140fe5"},
-    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:2feb1d960f760a575dbc5ab3b1c00504b24caaf6986e2dc2b01c09c87866a943"},
-    {file = "Brotli-1.1.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:4410f84b33374409552ac9b6903507cdb31cd30d2501fc5ca13d18f73548444a"},
     {file = "Brotli-1.1.0-cp38-cp38-win32.whl", hash = "sha256:db85ecf4e609a48f4b29055f1e144231b90edc90af7481aa731ba2d059226b1b"},
     {file = "Brotli-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3d7954194c36e304e1523f55d7042c59dc53ec20dd4e9ea9d151f1b62b4415c0"},
     {file = "Brotli-1.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5fb2ce4b8045c78ebbc7b8f3c15062e435d47e7393cc57c25115cfd49883747a"},
@@ -537,10 +499,6 @@ files = [
     {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:949f3b7c29912693cee0afcf09acd6ebc04c57af949d9bf77d6101ebb61e388c"},
     {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:89f4988c7203739d48c6f806f1e87a1d96e0806d44f0fba61dba81392c9e474d"},
     {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:de6551e370ef19f8de1807d0a9aa2cdfdce2e85ce88b122fe9f6b2b076837e59"},
-    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:0737ddb3068957cf1b054899b0883830bb1fec522ec76b1098f9b6e0f02d9419"},
-    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:4f3607b129417e111e30637af1b56f24f7a49e64763253bbc275c75fa887d4b2"},
-    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:6c6e0c425f22c1c719c42670d561ad682f7bfeeef918edea971a79ac5252437f"},
-    {file = "Brotli-1.1.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:494994f807ba0b92092a163a0a283961369a65f6cbe01e8891132b7a320e61eb"},
     {file = "Brotli-1.1.0-cp39-cp39-win32.whl", hash = "sha256:f0d8a7a6b5983c2496e364b969f0e526647a06b075d034f3297dc66f3b360c64"},
     {file = "Brotli-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:cdad5b9014d83ca68c25d2e9444e28e967ef16e80f6b436918c700c117a85467"},
     {file = "Brotli-1.1.0.tar.gz", hash = "sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724"},
@@ -1208,6 +1166,24 @@ files = [
 Flask = ">=0.10.1"
 python3-openid = ">=2.0"
 
+[[package]]
+name = "flask-sock"
+version = "0.7.0"
+description = "WebSocket support for Flask"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "flask-sock-0.7.0.tar.gz", hash = "sha256:e023b578284195a443b8d8bdb4469e6a6acf694b89aeb51315b1a34fcf427b7d"},
+    {file = "flask_sock-0.7.0-py3-none-any.whl", hash = "sha256:caac4d679392aaf010d02fabcf73d52019f5bdaf1c9c131ec5a428cb3491204a"},
+]
+
+[package.dependencies]
+flask = ">=2"
+simple-websocket = ">=0.5.1"
+
+[package.extras]
+docs = ["sphinx"]
+
 [[package]]
 name = "flask-socketio"
 version = "5.5.1"
@@ -4400,4 +4376,4 @@ cffi = ["cffi (>=1.11)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "97302e46e9652910b04b94d273d16d4c5da6c2a922f83ac29a316365154d6bb5"
+content-hash = "3945296e063e61dfe5d09131f55894c22a1d7f8f071d1f4ec4f4b8a9ffff32ff"
diff --git a/pyproject.toml b/pyproject.toml
index cd2ab313c3..4888debb70 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,6 +77,7 @@ qulacs = "^0.6.11"
 flask-babel = "^4.0.0"
 openpyxl = "^3.1.5"
 flask-socketio = "^5.5.1"
+flask-sock = "^0.7.0"
 
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.4.1"
diff --git a/timApp/events/websocket.service.ts b/timApp/events/websocket.service.ts
index 35070c1b70..e7c23f864a 100644
--- a/timApp/events/websocket.service.ts
+++ b/timApp/events/websocket.service.ts
@@ -1,57 +1,33 @@
 import {Injectable} from "@angular/core";
-// import type {WebSocketSubject} from "rxjs/webSocket";
-// import {webSocket} from "rxjs/webSocket";
-import type {Socket} from "socket.io-client";
-import {io} from "socket.io-client";
+import type {WebSocketSubject} from "rxjs/webSocket";
+import {webSocket} from "rxjs/webSocket";
 
-interface IMessage {
-    type: string;
-    data: string;
-}
+type IMessage = string;
 
 @Injectable({
     providedIn: "root",
 })
 export class WebSocketService {
-    // private socket: WebSocketSubject<string>;
-    private socket: Socket;
+    private socket: WebSocketSubject<IMessage>;
     messages$: IMessage[] = [];
 
     constructor() {
-        //        this.socket = webSocket("ws://localhost/");
-        this.socket = io("http://localhost", {
-            transports: ["websocket"],
-        });
-        this.socket.on("message", (data: IMessage) => {
-            console.log(data);
-            this.messages$.push(data);
+        this.socket = webSocket("http://localhost/ws");
+        this.socket.subscribe({
+            next: (msg) => this.messages$.push(msg), // Called whenever there is a message from the server.
+            error: (err) => console.log(err), // Called if at any point WebSocket API signals some kind of error.
+            complete: () => this.socket.next("disconnect"), // Called when connection is closed (for whatever reason).
         });
     }
 
     // Send a message to the server
     sendMessage(message: IMessage) {
         console.log("Send happened: ", message);
-        this.socket.send(message);
-        // this.messages$.push(message);
-        // this.socket.next(JSON.stringify(message));
+        this.socket.next(message);
     }
 
-    listenSocket() {}
-
-    // Receive messages from the server
-    /*    listenSocket(): void {
-  console.log("Listening...");
-  this.socket.subscribe({
-  next: (msg) => this.messages$.push(msg), // Called whenever there is a message from the server.
-  error: (err) => console.log(err), // Called if at any point WebSocket API signals some kind of error.
-  complete: () => console.log("complete"), // Called when connection is closed (for whatever reason).
-  });
-  console.log("Messages: ", this.messages$);
-  }*/
-
     // Close the WebSocket connection
     closeConnection() {
-        this.socket.off();
-        // this.socket.complete();
+        this.socket.complete();
     }
 }
diff --git a/timApp/static/scripts/tim/plugin/user-profile/user-profile.component.ts b/timApp/static/scripts/tim/plugin/user-profile/user-profile.component.ts
index 6f003ebd4b..be7d772867 100644
--- a/timApp/static/scripts/tim/plugin/user-profile/user-profile.component.ts
+++ b/timApp/static/scripts/tim/plugin/user-profile/user-profile.component.ts
@@ -55,10 +55,7 @@ const UploadedFile = t.intersection([
     }),
 ]);
 
-interface IMessage {
-    type: string;
-    data: string;
-}
+type IMessage = string;
 
 interface IUploadedFile extends t.TypeOf<typeof UploadedFile> {}
 
@@ -167,7 +164,7 @@ interface IUploadedFile extends t.TypeOf<typeof UploadedFile> {}
   <div #chatContainer style="height: 20em; overflow-y: auto;">
     <h3>Messages:</h3>
     <ul>
-        <li *ngFor="let msg of messages$">{{ msg.data }}</li>
+        <li *ngFor="let msg of messages$">{{ msg }}</li>
     </ul>
   </div>
 </div>
@@ -224,23 +221,14 @@ export class UserProfileComponent implements OnInit, OnDestroy {
         this.detailsUrl = `/profile/details/${this.documentId}`;
         this.user = Users.getCurrent();
 
-        // Subscribe to messages from the WebSocket
-        /*       this.messageSubscription = this.webSocketService
-            .getMessages()
-            .subscribe((message: IMessage) => {
-                console.log("Pushing msg: ", JSON.stringify(message));
-                this.messages.push(JSON.stringify(message));
-            });*/
-        // this.webSocketService.listenSocket();
+        // Store messages to variable for asynchronous visualisation in view
         this.messages$ = this.webSocketService.messages$;
     }
 
     sendMessage() {
         const userName = this.user ? this.user.name : "Guest";
-        const message: IMessage = {
-            type: "message",
-            data: `${userName}: ${this.newMessage}`,
-        };
+        const message: IMessage = `${userName}: ${this.newMessage}`;
+
         this.webSocketService.sendMessage(message);
         this.newMessage = "";
     }
diff --git a/timApp/tim.py b/timApp/tim.py
index 6e7029ef03..389fdd5fdd 100755
--- a/timApp/tim.py
+++ b/timApp/tim.py
@@ -108,6 +108,7 @@
 from timApp.velp.annotation import annotations
 from timApp.velp.velp import velps
 from flask_socketio import SocketIO, emit, send
+from flask_sock import Sock
 
 cache.init_app(app)
 
@@ -437,37 +438,41 @@ def after_request(resp: Response):
     return resp
 
 
-tim_socketio = SocketIO()  # (logger=True, engineio_logger=True)
+sock = Sock(app)
 
+# All joined clients
+client_list = []
 
-@tim_socketio.on("connect")
-def handle_connect():
+
+# Websocket route for communication between browser or client and server
+# Ensure that gevent.monkey module is imported and used for async websockets
+@sock.route("/ws")
+def handle_ws(ws):
     print("Client connected to /chat")
     current_user = get_current_user_object()
-    emit(
-        "message",
-        {
-            "type": "message",
-            "data": f"Welcome to the WebSocket server {current_user.real_name}!",
-        },
-        broadcast=True,
-    )
-
-
-@tim_socketio.on("message")
-def handle_message(msg):
-    print(f"Received message: {msg}")
-    emit(
-        "message",
-        msg,
-        broadcast=True,
-    )
-    # send(msg)
-
-
-@tim_socketio.on("disconnect")
-def handle_disconnect():
-    print("Client disconnected from /chat")
+    client_list.append(ws)
+    while True:
+        message = ws.receive()
+        print(message)
+        if message is None:
+            break
+
+        # TODO: this does not work, find proper message to match on connect and use it
+        if message == "connect":
+            ws.send(f"Hello {current_user.real_name}")
+
+        # TODO: ensure that disconnect happens properly when angular component destroys or client is gone
+        if message == "disconnect":
+            break
+
+        for client in client_list:
+            try:
+                print(client_list)
+                client.send(message)
+            except:
+                # TODO: when refreshing a TIM doc, "orphan" client removed and first message not seen after rejoin
+                client_list.remove(client)
+    client_list.remove(ws)
 
 
 def init_app():
@@ -500,19 +505,12 @@ def init_app():
         log_info(f"Mailman client credentials configured: {check_mailman_connection()}")
         log_info(f"Mailman events REST auth configured: {has_valid_event_auth()}")
 
-    tim_socketio.init_app(
-        app,
-        cors_allowed_origins="*",
-        async_mode="gevent",
-    )
     return app
 
 
 def start_app() -> None:
     init_app()
 
-    # app.run(
-    #    host="0.0.0.0", port=5000, use_evalex=False, use_reloader=False, threaded=True
-    # )
-
-    tim_socketio.run(app, host="0.0.0.0", port=5000, debug=True)
+    app.run(
+        host="0.0.0.0", port=5000, use_evalex=False, use_reloader=False, threaded=True
+    )
diff --git a/timApp/tim_app.py b/timApp/tim_app.py
index 0abfa2e41d..a260356ed0 100644
--- a/timApp/tim_app.py
+++ b/timApp/tim_app.py
@@ -3,6 +3,11 @@
 Insert only configuration-related things in this file. Do NOT define routes here.
 
 """
+from gevent import monkey
+
+# Enable asynchronous running for sockets etc.
+monkey.patch_all()
+
 import inspect
 import json
 import mimetypes
@@ -140,10 +145,6 @@
 )
 from tim_common.timjsonencoder import TimJsonProvider
 
-from gevent import monkey
-
-monkey.patch_all()
-
 # All SQLAlchemy models must be imported in this module.
 all_models = (
     AccessTypeModel,