diff --git a/pom.xml b/pom.xml
index eac7c9695..8f1ef5182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.4.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
     </parent>
 
     <properties>
diff --git a/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java b/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java
index f9caa3305..5a9068f5b 100644
--- a/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java
+++ b/src/main/java/works/weave/socks/cart/configuration/BeanConfiguration.java
@@ -51,7 +51,7 @@ public void destroy(Item item) {
 
             @Override
             public Item findOne(String id) {
-                return itemRepository.findOne(id);
+                return itemRepository.findById(id).orElse(null);
             }
         };
     }