diff --git a/lib/ember-cli/deploy/redis.rb b/lib/ember-cli/deploy/redis.rb
index 8afc231..c7c35c9 100644
--- a/lib/ember-cli/deploy/redis.rb
+++ b/lib/ember-cli/deploy/redis.rb
@@ -52,7 +52,8 @@ def current_key
       end
 
       def deploy_key
-        redis_client.get(current_key).presence || deployment_not_activated!
+        key = redis_client.get(current_key).presence || deployment_not_activated!
+        "#{namespace}:#{key}"
       end
 
       def build_client
diff --git a/spec/lib/ember-cli/deploy/redis_spec.rb b/spec/lib/ember-cli/deploy/redis_spec.rb
index 266f93a..6871b33 100644
--- a/spec/lib/ember-cli/deploy/redis_spec.rb
+++ b/spec/lib/ember-cli/deploy/redis_spec.rb
@@ -56,12 +56,12 @@
 
     context "when the current index is missing" do
       it "raises a helpful exception" do
-        deploy_key = "#{namespace}:abc123"
+        deploy_key = "abc123"
         stub_index_html(html: nil, deploy_key: deploy_key)
         ember_cli_deploy = build_ember_cli_deploy
 
         expect { ember_cli_deploy.html }.to raise_error(
-          /HTML for #{deploy_key} is missing/
+          /HTML for #{namespace}:#{deploy_key} is missing/
         )
       end
     end
@@ -98,9 +98,9 @@ def stub_current_key(deploy_key)
     redis.set(current_key, deploy_key)
   end
 
-  def stub_index_html(deploy_key: "#{namespace}:123", html:)
+  def stub_index_html(deploy_key: "123", html:)
     stub_current_key(deploy_key)
-    redis.set(deploy_key, html)
+    redis.set("#{namespace}:#{deploy_key}", html)
   end
 
   def redis