diff --git a/storage_mem.go b/storage_mem.go
index 165b856..6d9988b 100644
--- a/storage_mem.go
+++ b/storage_mem.go
@@ -22,9 +22,17 @@ func newStorageMem() storage {
 }
 
 func (s storageMem) Create(secret string, expireIn time.Duration) (string, error) {
-	id := uuid.Must(uuid.NewV4()).String()
+	var (
+		expire time.Time
+		id     = uuid.Must(uuid.NewV4()).String()
+	)
+
+	if expireIn > 0 {
+		expire = time.Now().Add(expireIn)
+	}
+
 	s.store[id] = memStorageSecret{
-		Expiry: time.Now().Add(expireIn),
+		Expiry: expire,
 		Secret: secret,
 	}
 
diff --git a/storage_redis.go b/storage_redis.go
index 4168000..09c27cc 100644
--- a/storage_redis.go
+++ b/storage_redis.go
@@ -42,7 +42,7 @@ func newStorageRedis() (storage, error) {
 
 func (s storageRedis) Create(secret string, expireIn time.Duration) (string, error) {
 	id := uuid.Must(uuid.NewV4()).String()
-	err := s.conn.SetEx(context.Background(), s.redisKey(id), secret, expireIn).Err()
+	err := s.conn.Set(context.Background(), s.redisKey(id), secret, expireIn).Err()
 
 	return id, errors.Wrap(err, "writing redis key")
 }