diff --git a/src/lti/tool_provider.py b/src/lti/tool_provider.py
index 4eaf480..000c3b1 100644
--- a/src/lti/tool_provider.py
+++ b/src/lti/tool_provider.py
@@ -58,10 +58,12 @@ def is_valid_request(self, validator):
             self.launch_headers
         )
 
-        if valid and not self.consumer_key and not self.consumer_secret:
+        if valid:
             # Gather the key and secret
-            self.consumer_key = self.launch_params['oauth_consumer_key']
-            self.consumer_secret = validator.secret
+            if not self.consumer_key:
+                self.consumer_key = self.launch_params['oauth_consumer_key']
+            if not self.consumer_secret:
+                self.consumer_secret = validator.secret
 
         return valid