diff --git a/src/main/java/com/commafeed/CommaFeedApplication.java b/src/main/java/com/commafeed/CommaFeedApplication.java
index d065ad36..fbbd4f20 100644
--- a/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -208,7 +208,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		NextUnreadServlet nextUnreadServlet = new NextUnreadServlet(sessionFactory, feedSubscriptionDAO, feedEntryStatusDAO,
 				feedCategoryDAO, config);
 		LogoutServlet logoutServlet = new LogoutServlet(config);
-		CustomCssServlet customCssServlet = new CustomCssServlet(sessionFactory, userSettingsDAO, config);
+		CustomCssServlet customCssServlet = new CustomCssServlet(sessionFactory, userSettingsDAO);
 		AnalyticsServlet analyticsServlet = new AnalyticsServlet(config);
 		environment.servlets().addServlet("next", nextUnreadServlet).addMapping("/next");
 		environment.servlets().addServlet("logout", logoutServlet).addMapping("/logout");
diff --git a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
index afdf1b4b..a7fd1542 100644
--- a/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
+++ b/src/main/java/com/commafeed/frontend/servlet/CustomCssServlet.java
@@ -12,7 +12,6 @@ import lombok.RequiredArgsConstructor;
 import org.hibernate.SessionFactory;
 
 import com.commafeed.CommaFeedApplication;
-import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.dao.UnitOfWork;
 import com.commafeed.backend.dao.UserSettingsDAO;
 import com.commafeed.backend.model.User;
@@ -24,13 +23,13 @@ public class CustomCssServlet extends HttpServlet {
 
 	private final SessionFactory sessionFactory;
 	private final UserSettingsDAO userSettingsDAO;
-	private final CommaFeedConfiguration config;
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		resp.setContentType("text/css");
+
 		final User user = (User) req.getSession().getAttribute(CommaFeedApplication.SESSION_USER);
 		if (user == null) {
-			resp.sendRedirect(resp.encodeRedirectURL(config.getApplicationSettings().getPublicUrl()));
 			return;
 		}
 
@@ -40,8 +39,10 @@ public class CustomCssServlet extends HttpServlet {
 				return userSettingsDAO.findByUser(user);
 			}
 		}.run();
+		if (settings == null) {
+			return;
+		}
 
-		resp.setContentType("text/css");
 		resp.getWriter().write(settings.getCustomCss());
 	}
 }