diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index 2206ade34015937e2856678dda6ce2166a39407d..5650707c3de8ce1629ba0560bdcbc7d758114d1f 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -1135,8 +1135,11 @@ class CalibrationManager(DeviceClientBase, Device):
         if key_patterns:
             try:
                 # Try to obtain most recent configuration.
-                old_config = await getConfigurationFromPast(
-                    device_id, datetime.now().isoformat())
+                old_config = await wait_for(getConfigurationFromPast(
+                    device_id, datetime.now().isoformat()), 15.0)
+            except AsyncTimeoutError:
+                self.logger.warn(f'Timeout receiving previous configuration '
+                                 f'for {device_id}')
             except KaraboError as e:
                 self.logger.warn(f'Failed receiving previous configuration '
                                  f'for {device_id}: {e}')