diff --git a/voltha/worker.py b/voltha/worker.py
index b47accc..154c931 100644
--- a/voltha/worker.py
+++ b/voltha/worker.py
@@ -118,7 +118,7 @@
                 core_stores = [c['Value'] for c in results if
                                c['Key'] == self.coord.assignment_prefix +
                                self.instance_id + '/' +
-                               self.coord.core_storage_suffix]
+                               self.coord.core_storage_suffix and c['Value']]
                 if core_stores:
                     self.mycore_store_id = core_stores[0]
                     log.debug('store-assigned',