diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index c173f5c21..e91e603fc 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -37885,8 +37885,7 @@ axolotlInternal.RecipientRecord = function() {
     window.textsecure = window.textsecure || {};
     window.textsecure.crypto = {
         // Decrypts message into a raw string
-        decryptWebsocketMessage: function(message) {
-            var signaling_key = textsecure.storage.get("signaling_key"); //TODO: in crypto_storage
+        decryptWebsocketMessage: function(message, signaling_key) {
             var aes_key = signaling_key.slice(0, 32);
             var mac_key = signaling_key.slice(32, 32 + 20);
 
diff --git a/libtextsecure/crypto.js b/libtextsecure/crypto.js
index 5e0b83640..185b38e03 100644
--- a/libtextsecure/crypto.js
+++ b/libtextsecure/crypto.js
@@ -35,8 +35,7 @@
     window.textsecure = window.textsecure || {};
     window.textsecure.crypto = {
         // Decrypts message into a raw string
-        decryptWebsocketMessage: function(message) {
-            var signaling_key = textsecure.storage.get("signaling_key"); //TODO: in crypto_storage
+        decryptWebsocketMessage: function(message, signaling_key) {
             var aes_key = signaling_key.slice(0, 32);
             var mac_key = signaling_key.slice(32, 32 + 20);