diff --git a/src/webui/service/main/routes.py b/src/webui/service/main/routes.py
index a568c75d6caad1d3cc3b4a2a5237470921849ad8..1901948676c7adbe6e926eda0d42d796e23dcca3 100644
--- a/src/webui/service/main/routes.py
+++ b/src/webui/service/main/routes.py
@@ -14,7 +14,7 @@
 
 import json, logging
 from flask import jsonify, redirect, render_template, Blueprint, flash, session, url_for, request
-from common.proto.context_pb2 import Context, Device, Empty, Link, Topology
+from common.proto.context_pb2 import Context, Device, Empty, Link, Topology, ContextIdList
 from context.client.ContextClient import ContextClient
 from device.client.DeviceClient import DeviceClient
 from webui.service.main.forms import ContextForm, DescriptorForm
@@ -66,7 +66,7 @@ def process_descriptors(descriptors):
 def home():
     context_client.connect()
     device_client.connect()
-    response = context_client.ListContextIds(Empty())
+    response: ContextIdList = context_client.ListContextIds(Empty())
     context_form: ContextForm = ContextForm()
     context_form.context.choices.append(('', 'Select...'))
     for context in response.context_ids:
diff --git a/src/webui/tests/test_unitary.py b/src/webui/tests/test_unitary.py
index 0360e32535896c0900720535d6fb5a61d021b5ea..15521ac087b207d55a2da7d00a52d01900e19350 100644
--- a/src/webui/tests/test_unitary.py
+++ b/src/webui/tests/test_unitary.py
@@ -19,7 +19,7 @@ from flask.testing import FlaskClient
 from flask.app import Flask
 from flask.helpers import url_for
 from common.DeviceTypes import DeviceTypeEnum
-from common.proto.context_pb2 import Empty, DeviceId, DeviceList, TopologyIdList
+from common.proto.context_pb2 import ContextIdList, Empty, DeviceId, DeviceList, TopologyIdList
 # from device.client.DeviceClient import DeviceClient
 from webui.service import create_app
 
@@ -38,6 +38,11 @@ class TestWebUI(ClientTestCase):
         self.mocker_delete_device.start()
         self.addCleanup(self.mocker_delete_device.stop)
 
+        self.mocker_list_context_ids = mock.patch('webui.service.device.routes.context_client.ListContextIds')
+        self.mocker_list_context_ids.return_value = ContextIdList()  # returns an empty list
+        self.mocker_list_context_ids.start()
+        self.addCleanup(self.mocker_list_context_ids.stop)
+
         self.mocker_list_devices = mock.patch('webui.service.device.routes.context_client.ListDevices')
         self.mocker_list_devices.return_value = DeviceList()  # returns an empty list
         self.mocker_list_devices.start()