diff --git a/cmd/root.go b/cmd/root.go
index 34a79a5..ea5de8e 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -250,13 +250,12 @@ func rootCmdRun(*cobra.Command, []string) {
 				if err := s.Environment.Attach(); err != nil {
 					s.Log().WithField("error", errors.WithStackIf(err)).Warn("failed to attach to running server environment")
 				}
-
-				return
+			} else {
+				// At this point we've determined that the server should indeed be in an offline state, so we'll
+				// make a call to set that state just to ensure we don't ever accidentally end up with some invalid
+				// state being tracked.
+				s.Environment.SetState(environment.ProcessOfflineState)
 			}
-
-			// Addresses potentially invalid data in the stored file that can cause Wings to lose
-			// track of what the actual server state is.
-			s.Environment.SetState(environment.ProcessOfflineState)
 		})
 	}
 
diff --git a/environment/docker/stats.go b/environment/docker/stats.go
index 7ff389f..b00a31e 100644
--- a/environment/docker/stats.go
+++ b/environment/docker/stats.go
@@ -15,15 +15,14 @@ import (
 // Attach to the instance and then automatically emit an event whenever the resource usage for the
 // server process changes.
 func (e *Environment) pollResources(ctx context.Context) error {
-	l := log.WithField("container_id", e.Id)
-
-	l.Debug("starting resource polling for container")
-	defer l.Debug("stopped resource polling for container")
-
 	if e.st.Load() == environment.ProcessOfflineState {
 		return errors.New("cannot enable resource polling on a stopped server")
 	}
 
+	l := log.WithField("container_id", e.Id)
+	l.Debug("starting resource polling for container")
+	defer l.Debug("stopped resource polling for container")
+
 	stats, err := e.client.ContainerStats(context.Background(), e.Id, true)
 	if err != nil {
 		return errors.WithStackIf(err)