diff --git a/pkg/client/client.go b/pkg/client/client.go
index a2d1f49001..8aea1bde24 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -994,7 +994,7 @@ func (c *immuClient) CurrentState(ctx context.Context) (*schema.ImmutableState,
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("Current state finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("Current state finished in %s", time.Since(start)) }()
 
 	return c.ServiceClient.CurrentState(ctx, &empty.Empty{})
 }
@@ -1006,7 +1006,7 @@ func (c *immuClient) Get(ctx context.Context, key []byte, opts ...GetOption) (*s
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("get finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("get finished in %s", time.Since(start)) }()
 
 	req := &schema.KeyRequest{Key: key}
 	for _, opt := range opts {
@@ -1040,7 +1040,7 @@ func (c *immuClient) GetAtRevision(ctx context.Context, key []byte, rev int64) (
 // Gets reads a single value for given key with additional server-provided proof validation.
 func (c *immuClient) VerifiedGet(ctx context.Context, key []byte, opts ...GetOption) (vi *schema.Entry, err error) {
 	start := time.Now()
-	defer c.Logger.Debugf("VerifiedGet finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("VerifiedGet finished in %s", time.Since(start)) }()
 
 	req := &schema.KeyRequest{Key: key}
 	for _, opt := range opts {
@@ -1307,7 +1307,7 @@ func (c *immuClient) VerifiedSet(ctx context.Context, key []byte, value []byte)
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("VerifiedSet finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("VerifiedSet finished in %s", time.Since(start)) }()
 
 	state, err := c.StateService.GetState(ctx, c.Options.CurrentDatabase)
 	if err != nil {
@@ -1467,7 +1467,7 @@ func (c *immuClient) GetAll(ctx context.Context, keys [][]byte) (*schema.Entries
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("get-batch finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("get-batch finished in %s", time.Since(start)) }()
 
 	keyList := &schema.KeyListRequest{}
 
@@ -1495,12 +1495,11 @@ func (c *immuClient) TxByID(ctx context.Context, tx uint64) (*schema.Tx, error)
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("by-index finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("by-index finished in %s", time.Since(start)) }()
 
 	t, err := c.ServiceClient.TxById(ctx, &schema.TxRequest{
 		Tx: tx,
 	})
-
 	if err != nil {
 		return nil, err
 	}
@@ -1533,7 +1532,7 @@ func (c *immuClient) VerifiedTxByID(ctx context.Context, tx uint64) (*schema.Tx,
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("VerifiedTxByID finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("VerifiedTxByID finished in %s", time.Since(start)) }()
 
 	state, err := c.StateService.GetState(ctx, c.Options.CurrentDatabase)
 	if err != nil {
@@ -1619,7 +1618,7 @@ func (c *immuClient) History(ctx context.Context, req *schema.HistoryRequest) (s
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("history finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("history finished in %s", time.Since(start)) }()
 
 	return c.ServiceClient.History(ctx, req)
 }
@@ -1640,7 +1639,7 @@ func (c *immuClient) SetReferenceAt(ctx context.Context, key []byte, referencedK
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("SetReference finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("SetReference finished in %s", time.Since(start)) }()
 
 	txhdr, err := c.ServiceClient.SetReference(ctx, &schema.ReferenceRequest{
 		Key:           key,
@@ -1683,7 +1682,7 @@ func (c *immuClient) VerifiedSetReferenceAt(ctx context.Context, key []byte, ref
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("safereference finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("safereference finished in %s", time.Since(start)) }()
 
 	state, err := c.StateService.GetState(ctx, c.Options.CurrentDatabase)
 	if err != nil {
@@ -1798,7 +1797,7 @@ func (c *immuClient) ZAddAt(ctx context.Context, set []byte, score float64, key
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("zadd finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("zadd finished in %s", time.Since(start)) }()
 
 	hdr, err := c.ServiceClient.ZAdd(ctx, &schema.ZAddRequest{
 		Set:      set,
@@ -1848,7 +1847,7 @@ func (c *immuClient) VerifiedZAddAt(ctx context.Context, set []byte, score float
 	}
 
 	start := time.Now()
-	defer c.Logger.Debugf("safezadd finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("safezadd finished in %s", time.Since(start)) }()
 
 	state, err := c.StateService.GetState(ctx, c.Options.CurrentDatabase)
 	if err != nil {
diff --git a/pkg/client/streams.go b/pkg/client/streams.go
index 9308984701..871ec69666 100644
--- a/pkg/client/streams.go
+++ b/pkg/client/streams.go
@@ -141,7 +141,7 @@ func (c *immuClient) _streamVerifiedSet(ctx context.Context, kvs []*stream.KeyVa
 	defer c.StateService.CacheUnlock()
 
 	start := time.Now()
-	defer c.Logger.Debugf("StreamVerifiedSet finished in %s", time.Since(start))
+	defer func() { c.Logger.Debugf("StreamVerifiedSet finished in %s", time.Since(start)) }()
 
 	state, err := c.StateService.GetState(ctx, c.Options.CurrentDatabase)
 	if err != nil {