diff --git a/raiden-cli/src/index.ts b/raiden-cli/src/index.ts
index e31756e8f9..f2dce202ae 100644
--- a/raiden-cli/src/index.ts
+++ b/raiden-cli/src/index.ts
@@ -206,7 +206,7 @@ function shutdownRaiden(this: Cli): void {
     this.log.info('Stopping raiden...');
     this.raiden.stop();
     // force-exit at most 5s after stopping raiden
-    unrefTimeout(setTimeout(() => process.exit(0), 5000));
+    unrefTimeout(setTimeout(() => process.exit(0), 10000));
   } else {
     process.exit(1);
   }
diff --git a/raiden-ts/src/transport/epics/webrtc.ts b/raiden-ts/src/transport/epics/webrtc.ts
index bc962bc284..433904c67c 100644
--- a/raiden-ts/src/transport/epics/webrtc.ts
+++ b/raiden-ts/src/transport/epics/webrtc.ts
@@ -401,7 +401,13 @@ function listenDataChannel(
               );
             }),
           ),
-        ).pipe(finalize(() => (dataChannel.close(), connection.close()))),
+        ).pipe(
+          finalize(() => {
+            dataChannel.close();
+            // FIXME: https://github.com/node-webrtc/node-webrtc/issues/636
+            // connection.close();
+          }),
+        ),
       ),
     );
 }