diff --git a/core/commands/bitswap.go b/core/commands/bitswap.go
index cfc522bae..daa9ae0cd 100644
--- a/core/commands/bitswap.go
+++ b/core/commands/bitswap.go
@@ -38,6 +38,12 @@ Print out all blocks currently on the bitswap wantlist for the local peer`,
 			res.SetError(err, cmds.ErrNormal)
 			return
 		}
+
+		if !nd.OnlineMode() {
+			res.SetError(errNotOnline, cmds.ErrClient)
+			return
+		}
+
 		bs, ok := nd.Exchange.(*bitswap.Bitswap)
 		if !ok {
 			res.SetError(u.ErrCast(), cmds.ErrNormal)
@@ -78,6 +84,11 @@ var bitswapStatCmd = &cmds.Command{
 			return
 		}
 
+		if !nd.OnlineMode() {
+			res.SetError(errNotOnline, cmds.ErrClient)
+			return
+		}
+
 		bs, ok := nd.Exchange.(*bitswap.Bitswap)
 		if !ok {
 			res.SetError(u.ErrCast(), cmds.ErrNormal)