diff --git a/baseapp/abci.go b/baseapp/abci.go
index 1809bd70b5be..911dbff4dc68 100644
--- a/baseapp/abci.go
+++ b/baseapp/abci.go
@@ -681,12 +681,12 @@ func (app *BaseApp) GetBlockRetentionHeight(commitHeight int64) int64 {
 	}
 
 	if app.snapshotManager != nil {
+		snapshotInterval := int64(app.snapshotManager.GetInterval())
 		// Define the state pruning offset, i.e. the block offset at which the
 		// underlying logical database is persisted to disk.
-		statePruningOffset := int64(app.snapshotManager.GetInterval())
-		if statePruningOffset > 0 {
-			if commitHeight > statePruningOffset {
-				v := commitHeight - (commitHeight % statePruningOffset)
+		if snapshotInterval > 0 {
+			if commitHeight > snapshotInterval {
+				v := commitHeight - (commitHeight % snapshotInterval)
 				retentionHeight = minNonZero(retentionHeight, v)
 			} else {
 				// Hitting this case means we have persisting enabled but have yet to reach
@@ -695,11 +695,10 @@ func (app *BaseApp) GetBlockRetentionHeight(commitHeight int64) int64 {
 				// any state committed to disk.
 				return 0
 			}
-		}
-
-		snapshotRetentionHeights := app.snapshotManager.GetSnapshotBlockRetentionHeights()
-		if snapshotRetentionHeights > 0 {
-			retentionHeight = minNonZero(retentionHeight, commitHeight-snapshotRetentionHeights)
+			snapshotRetentionHeights := app.snapshotManager.GetSnapshotBlockRetentionHeights()
+			if snapshotRetentionHeights > 0 {
+				retentionHeight = minNonZero(retentionHeight, commitHeight-snapshotRetentionHeights)
+			}
 		}
 	}
 
diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go
index 8693e62dc574..ed5a30b225f2 100644
--- a/baseapp/baseapp_test.go
+++ b/baseapp/baseapp_test.go
@@ -2250,10 +2250,11 @@ func TestBaseApp_Init(t *testing.T) {
 	require.NoError(t, err)
 
 	testCases := map[string]struct {
-		bapp             *BaseApp
-		expectedPruning  pruningtypes.PruningOptions
-		expectedSnapshot snapshottypes.SnapshotOptions
-		expectedErr      error
+		bapp                 *BaseApp
+		expectedPruning      pruningtypes.PruningOptions
+		expectedSnapshot     snapshottypes.SnapshotOptions
+		expectedErr          error
+		isSnapshotManagerNil bool
 	}{
 		"snapshot but no pruning": {
 			NewBaseApp(name, logger, db, nil,
@@ -2263,14 +2264,26 @@ func TestBaseApp_Init(t *testing.T) {
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			// if no pruning is set, the default is PruneNothing
 			nil,
+			false,
+		},
+		"nil snapshot store": {
+			NewBaseApp(name, logger, db, nil,
+				SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningNothing)),
+				SetSnapshot(nil, snapshottypes.NewSnapshotOptions(1500, 2)),
+			),
+			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
+			snapshottypes.SnapshotOptions{},
+			nil,
+			true,
 		},
 		"pruning everything only": {
 			NewBaseApp(name, logger, db, nil,
 				SetPruning(pruningtypes.NewPruningOptions(pruningtypes.PruningEverything)),
 			),
 			pruningtypes.NewPruningOptions(pruningtypes.PruningEverything),
-			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
+			snapshottypes.SnapshotOptions{},
 			nil,
+			true,
 		},
 		"pruning nothing only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2279,6 +2292,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning default only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2287,6 +2301,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningDefault),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning custom only": {
 			NewBaseApp(name, logger, db, nil,
@@ -2295,6 +2310,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
 			nil,
+			true,
 		},
 		"pruning everything and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2304,6 +2320,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningEverything),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning nothing and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2313,6 +2330,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningNothing),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning default and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2322,6 +2340,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewPruningOptions(pruningtypes.PruningDefault),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"pruning custom and snapshots": {
 			NewBaseApp(name, logger, db, nil,
@@ -2331,6 +2350,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			nil,
+			false,
 		},
 		"error custom pruning 0 interval": {
 			NewBaseApp(name, logger, db, nil,
@@ -2340,6 +2360,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 0),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningIntervalZero,
+			false,
 		},
 		"error custom pruning too small interval": {
 			NewBaseApp(name, logger, db, nil,
@@ -2349,6 +2370,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 9),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningIntervalTooSmall,
+			false,
 		},
 		"error custom pruning too small keep recent": {
 			NewBaseApp(name, logger, db, nil,
@@ -2358,15 +2380,17 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(9, 10),
 			snapshottypes.NewSnapshotOptions(1500, 2),
 			pruningtypes.ErrPruningKeepRecentTooSmall,
+			false,
 		},
-		"snapshot zero interval - manager not set": {
+		"snapshot zero interval - manager is set": {
 			NewBaseApp(name, logger, db, nil,
 				SetPruning(pruningtypes.NewCustomPruningOptions(10, 10)),
 				SetSnapshot(snapshotStore, snapshottypes.NewSnapshotOptions(0, 2)),
 			),
 			pruningtypes.NewCustomPruningOptions(10, 10),
-			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 0),
+			snapshottypes.NewSnapshotOptions(snapshottypes.SnapshotIntervalOff, 2),
 			nil,
+			false,
 		},
 		"snapshot zero keep recent - allowed": {
 			NewBaseApp(name, logger, db, nil,
@@ -2376,6 +2400,7 @@ func TestBaseApp_Init(t *testing.T) {
 			pruningtypes.NewCustomPruningOptions(10, 10),
 			snapshottypes.NewSnapshotOptions(1500, 0), // 0 snapshot-keep-recent means keep all
 			nil,
+			false,
 		},
 	}
 
@@ -2390,7 +2415,7 @@ func TestBaseApp_Init(t *testing.T) {
 		actualPruning := tc.bapp.cms.GetPruning()
 		require.Equal(t, tc.expectedPruning, actualPruning)
 
-		if tc.expectedSnapshot.Interval == snapshottypes.SnapshotIntervalOff {
+		if tc.isSnapshotManagerNil {
 			require.Nil(t, tc.bapp.snapshotManager)
 			continue
 		}
diff --git a/baseapp/options.go b/baseapp/options.go
index 92f1ca338267..ffbe982497ad 100644
--- a/baseapp/options.go
+++ b/baseapp/options.go
@@ -205,7 +205,7 @@ func (app *BaseApp) SetSnapshot(snapshotStore *snapshots.Store, opts snapshottyp
 	if app.sealed {
 		panic("SetSnapshot() on sealed BaseApp")
 	}
-	if snapshotStore == nil || opts.Interval == snapshottypes.SnapshotIntervalOff {
+	if snapshotStore == nil {
 		app.snapshotManager = nil
 		return
 	}