diff --git a/cassandra/policies.py b/cassandra/policies.py
index 94363db9..d4106a8d 100644
--- a/cassandra/policies.py
+++ b/cassandra/policies.py
@@ -359,7 +359,7 @@ class TokenAwarePolicy(LoadBalancingPolicy):
                 yield host
         else:
             routing_key = query.routing_key
-            if routing_key is None:
+            if routing_key is None or keyspace is None:
                 for host in child.make_query_plan(keyspace, query):
                     yield host
             else: