diff --git a/backend/app/server.go b/backend/app/server.go
index 5192220..b50d337 100644
--- a/backend/app/server.go
+++ b/backend/app/server.go
@@ -936,11 +936,21 @@ func (s *Server) checkAndServePhishingPage(
 				s.logger.Debugw("serving before landing page from state",
 					"pageID", pageID.String(),
 				)
-			} else {
+			} else if beforeProxyID != nil {
 				proxyID = beforeProxyID
 				s.logger.Debugw("serving before landing Proxy from state",
 					"proxyID", proxyID.String(),
 				)
+			} else if landingPageID != nil {
+				pageID = landingPageID
+				s.logger.Debugw("before stage no longer configured, falling back to landing page for before state",
+					"pageID", pageID.String(),
+				)
+			} else {
+				proxyID = landingProxyID
+				s.logger.Debugw("before stage no longer configured, falling back to landing Proxy for before state",
+					"proxyID", proxyID.String(),
+				)
 			}
 			currentPageType = data.PAGE_TYPE_BEFORE
 			nextPageType = data.PAGE_TYPE_LANDING