diff --git a/src/window.h b/src/window.h
index e2d516a4..ae1e7044 100644
--- a/src/window.h
+++ b/src/window.h
@@ -290,7 +290,6 @@ typedef struct WWindow {
 
         unsigned int user_changed_width:1;
         unsigned int user_changed_height:1;
-        unsigned int net_state_from_client:1; /* state hint was set by client */
         unsigned int net_skip_pager:1;
         unsigned int net_handle_icon:1;
         unsigned int net_show_desktop:1;
diff --git a/src/wmspec.c b/src/wmspec.c
index 94568414..ae870ea5 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -795,9 +795,7 @@ static void updateWorkspaceHint(WWindow * wwin, Bool fake, Bool del)
 static void updateStateHint(WWindow * wwin, Bool changedWorkspace, Bool del)
 {				/* changeable */
 	if (del) {
-		if (!wwin->flags.net_state_from_client) {
-			XDeleteProperty(dpy, wwin->client_win, net_wm_state);
-		}
+		XDeleteProperty(dpy, wwin->client_win, net_wm_state);
 	} else {
 		Atom state[15];	/* nr of defined state atoms */
 		int i = 0;