diff --git a/cmd/skywire-cli/commands/ut/root.go b/cmd/skywire-cli/commands/ut/root.go
index 3d61250ab3..ef9b538561 100644
--- a/cmd/skywire-cli/commands/ut/root.go
+++ b/cmd/skywire-cli/commands/ut/root.go
@@ -149,8 +149,6 @@ func dmsgHTTPQuery(cmd *cobra.Command) ([]byte, error) {
 
 	dmsgHTTP := http.Client{Transport: dmsghttp.MakeHTTPTransport(cmd.Context(), dmsgDC)}
 
-	dmsgHTTP.Timeout = time.Second * 15
-
 	resp, err := dmsgHTTP.Get(utDmsgAddr + "/uptimes?v=v2")
 	if err != nil {
 		return []byte{}, err
diff --git a/pkg/visor/api.go b/pkg/visor/api.go
index 4e255155bd..790d27329d 100644
--- a/pkg/visor/api.go
+++ b/pkg/visor/api.go
@@ -564,7 +564,9 @@ func (v *Visor) FetchUptimeTrackerData(pk string) ([]byte, error) {
 			return body, fmt.Errorf("Invalid or missing public key")
 		}
 	}
-
+	if v.uptimeTracker == nil {
+		return body, fmt.Errorf("Uptime tracker module not available")
+	}
 	return v.uptimeTracker.FetchUptimes(context.TODO(), pk)
 }