diff --git a/src/controllers/api/streaming.ts b/src/controllers/api/streaming.ts
index 59345928..24ad1c6e 100644
--- a/src/controllers/api/streaming.ts
+++ b/src/controllers/api/streaming.ts
@@ -6,6 +6,9 @@ const streamingController: AppController = (c) => {
   const upgrade = c.req.headers.get('upgrade');
   const token = c.req.headers.get('sec-websocket-protocol');
 
+  const stream = c.req.query('stream');
+  const nostr = c.req.query('nostr');
+
   if (upgrade?.toLowerCase() !== 'websocket') {
     return c.text('Please use websocket protocol', 400);
   }
@@ -24,8 +27,9 @@ const streamingController: AppController = (c) => {
   socket.addEventListener('close', () => console.log('websocket: connection closed'));
   socket.addEventListener('message', (e) => console.log('websocket message: ', e.data));
 
-  // FIXME: Only do this for nostr.sign events.
-  signStreams.set(token, socket);
+  if (stream === 'user' && nostr === 'true') {
+    signStreams.set(token, socket);
+  }
 
   return response;
 };
diff --git a/src/sign.ts b/src/sign.ts
index 5e5dc7ed..25b31e53 100644
--- a/src/sign.ts
+++ b/src/sign.ts
@@ -34,7 +34,7 @@ async function signEvent<K extends number = number>(event: EventTemplate<K>, c:
           }
         });
         stream.send(JSON.stringify({ event: 'nostr.sign', payload: JSON.stringify(event) }));
-        setTimeout(reject, 30000);
+        setTimeout(reject, 60000);
       });
     } catch (_e) {
       throw new HTTPException(504, {