diff --git a/birb_scheduler_teller/views/assignment_view.py b/birb_scheduler_teller/views/assignment_view.py
index 9a2135f..33dc6fd 100644
--- a/birb_scheduler_teller/views/assignment_view.py
+++ b/birb_scheduler_teller/views/assignment_view.py
@@ -58,11 +58,14 @@ class AssignmentView(FlaskView):
         if not target_site:
             default_target = redis_client.get('DEFAULT:SCHEDULED')
 
+            if default_target:
+                default_target = default_target.decode('utf-8')
+
             if not default_target:
                 default_target = current_app.config['DEFAULT_WHILE_NOT_DEFINED'][0]
 
             if default_target:
-                target_site = default_target.decode('utf-8')
+                target_site = default_target
                 redis_client.set(schedule_store_key, default_target)
 
         # Update (or set) TTL