diff --git a/src/main/java/edu/tamu/scholars/middleware/auth/controller/RegistrationController.java b/src/main/java/edu/tamu/scholars/middleware/auth/controller/RegistrationController.java
index 841e3a286..82bfad4d4 100644
--- a/src/main/java/edu/tamu/scholars/middleware/auth/controller/RegistrationController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/auth/controller/RegistrationController.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,7 @@
 @RequestMapping("/registration")
 public class RegistrationController {
 
+    @Lazy
     @Autowired
     private RegistrationService registrationService;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndexingController.java b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndexingController.java
index b98d95ab7..641d1cb06 100644
--- a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndexingController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndexingController.java
@@ -1,6 +1,7 @@
 package edu.tamu.scholars.middleware.discovery.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,6 +14,7 @@
 @RequestMapping("/index")
 public class IndexingController {
 
+    @Lazy
     @Autowired
     private IndexService indexService;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualAnalyticsController.java b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualAnalyticsController.java
index e718967ae..0f41a717b 100644
--- a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualAnalyticsController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualAnalyticsController.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,6 +23,7 @@
 @RequestMapping("/individual/analytics")
 public class IndividualAnalyticsController {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualController.java b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualController.java
index 52074268f..4460ea7d5 100644
--- a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualController.java
@@ -12,6 +12,7 @@
 import javax.persistence.EntityNotFoundException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.hateoas.PagedModel;
@@ -38,12 +39,15 @@
 @RestController
 public class IndividualController implements RepresentationModelProcessor<IndividualModel> {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
+    @Lazy
     @Autowired
     private IndividualResourceAssembler assembler;
 
+    @Lazy
     @Autowired
     private DiscoveryPagedResourcesAssembler<Individual> pagedAssembler;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchController.java b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchController.java
index 47c771a99..ff2fced2b 100644
--- a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchController.java
@@ -11,6 +11,7 @@
 import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.rest.webmvc.RepositorySearchesResource;
@@ -39,12 +40,15 @@
 @RequestMapping("/individual")
 public class IndividualSearchController implements RepresentationModelProcessor<RepositorySearchesResource> {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
+    @Lazy
     @Autowired
     private IndividualResourceAssembler assembler;
 
+    @Lazy
     @Autowired
     private DiscoveryPagedResourcesAssembler<Individual> pagedAssembler;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchCountController.java b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchCountController.java
index cd8aab531..7bb2d362b 100644
--- a/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchCountController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/discovery/controller/IndividualSearchCountController.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,6 +18,7 @@
 @RestController
 public class IndividualSearchCountController {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualExportController.java b/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualExportController.java
index e9480cc15..fb350173b 100644
--- a/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualExportController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualExportController.java
@@ -9,6 +9,7 @@
 import javax.persistence.EntityNotFoundException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.hateoas.server.RepresentationModelProcessor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
@@ -34,9 +35,11 @@
 @RestController
 public class IndividualExportController implements RepresentationModelProcessor<IndividualModel> {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
+    @Lazy
     @Autowired
     private ExporterRegistry exporterRegistry;
 
diff --git a/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualSearchExportController.java b/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualSearchExportController.java
index 6abd474d3..cbe6d528e 100644
--- a/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualSearchExportController.java
+++ b/src/main/java/edu/tamu/scholars/middleware/export/controller/IndividualSearchExportController.java
@@ -10,6 +10,7 @@
 import java.util.concurrent.ExecutionException;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.rest.webmvc.RepositorySearchesResource;
 import org.springframework.data.web.SortDefault;
@@ -35,9 +36,11 @@
 @RestController
 public class IndividualSearchExportController implements RepresentationModelProcessor<RepositorySearchesResource> {
 
+    @Lazy
     @Autowired
     private IndividualRepo repo;
 
+    @Lazy
     @Autowired
     private ExporterRegistry exporterRegistry;