diff --git a/src/main/java/org/prgms/springbooturlshortener/domain/shorturl/service/ShortUrlService.java b/src/main/java/org/prgms/springbooturlshortener/domain/shorturl/service/ShortUrlService.java
index 367f2645..d6883b5d 100644
--- a/src/main/java/org/prgms/springbooturlshortener/domain/shorturl/service/ShortUrlService.java
+++ b/src/main/java/org/prgms/springbooturlshortener/domain/shorturl/service/ShortUrlService.java
@@ -21,11 +21,11 @@ public ShortUrlService(@Qualifier("BASE62") UrlTransformer urlTransformer, Short
 
     public String saveOriginalUrl(String originalUrl) {
         Random random = new Random();
-        int randomInt = random.nextInt();
+        int randomInt = random.nextInt(0, Integer.MAX_VALUE);
         String generatedUrl = urlTransformer.generateUrl(randomInt);
 
         while (urlRepository.findById(generatedUrl).isPresent()) {
-            randomInt = random.nextInt();
+            randomInt = random.nextInt(0, Integer.MAX_VALUE);
             generatedUrl = urlTransformer.generateUrl(randomInt);
         }
 
@@ -44,11 +44,11 @@ public String getOriginalUrl(String encodedUrl) {
 
         increaseVisit(shortUrl);
 
-        return shortUrl.getTransformedUrl();
+        return shortUrl.getOriginalUrl();
     }
 
     private void increaseVisit(ShortUrl shortUrl) {
         shortUrl.increaseVisit();
-        urlRepository.updateVisitCount(shortUrl.getTransformedUrl());
+        urlRepository.save(shortUrl);
     }
 }