diff --git a/server/pkg/middleware/access_token.go b/server/pkg/middleware/access_token.go
index 638a0895f0..c1ca120167 100644
--- a/server/pkg/middleware/access_token.go
+++ b/server/pkg/middleware/access_token.go
@@ -126,9 +126,7 @@ func (m *AccessTokenMiddleware) isDeviceLimitReached(ctx context.Context,
 	if network.IsCFWorkerIP(ip) {
 		return false, nil
 	}
-	if collectionSummary.DeviceLimit <= 0 { // no device limit was added
-		return false, nil
-	}
+
 	sharedID := collectionSummary.ID
 	hasAccessedInPast, err := m.PublicCollectionRepo.AccessedInPast(ctx, sharedID, ip, ua)
 	if err != nil {
@@ -156,7 +154,7 @@ func (m *AccessTokenMiddleware) isDeviceLimitReached(ctx context.Context,
 		}
 	}
 
-	if count >= deviceLimit {
+	if deviceLimit > 0 && count >= deviceLimit {
 		return true, nil
 	}
 	err = m.PublicCollectionRepo.RecordAccessHistory(ctx, sharedID, ip, ua)