diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c
index c55b8306acb..cd3fdd75a4c 100644
--- a/dlls/user32/clipboard.c
+++ b/dlls/user32/clipboard.c
@@ -121,26 +121,15 @@ static BOOL CLIPBOARD_GetClipboardInfo(LPCLIPBOARDINFO cbInfo)
 /**************************************************************************
  *	CLIPBOARD_ReleaseOwner
  */
-BOOL CLIPBOARD_ReleaseOwner(void)
+void CLIPBOARD_ReleaseOwner( HWND hwnd )
 {
-    BOOL bRet = FALSE;
-
     SERVER_START_REQ( set_clipboard_info )
     {
         req->flags = SET_CB_RELOWNER | SET_CB_SEQNO;
-
-        if (wine_server_call_err( req ))
-        {
-            ERR("Failed to set clipboard.\n");
-        }
-        else
-        {
-            bRet = TRUE;
-        }
+        req->owner = wine_server_user_handle( hwnd );
+        wine_server_call( req );
     }
     SERVER_END_REQ;
-
-    return bRet;
 }
 
 
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index e0c1b438271..1fbecb99fa8 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -222,7 +222,7 @@ extern HMODULE user32_module DECLSPEC_HIDDEN;
 struct dce;
 struct tagWND;
 
-extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN;
+extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN;
 extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN;
 extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN;
 extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN;
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 7090cb0afa0..7a3f48420ac 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -1875,8 +1875,7 @@ BOOL WINAPI DestroyWindow( HWND hwnd )
     WIN_SendDestroyMsg( hwnd );
     if (!IsWindow( hwnd )) return TRUE;
 
-    if (GetClipboardOwner() == hwnd)
-        CLIPBOARD_ReleaseOwner();
+    CLIPBOARD_ReleaseOwner( hwnd );
 
       /* Destroy the window storage */
 
diff --git a/server/clipboard.c b/server/clipboard.c
index 7a77ed282a2..9acee983747 100644
--- a/server/clipboard.c
+++ b/server/clipboard.c
@@ -172,11 +172,12 @@ static int set_clipboard_owner( struct clipboard *clipboard, user_handle_t win )
     return 1;
 }
 
-static int release_clipboard_owner( struct clipboard *clipboard )
+static int release_clipboard_owner( struct clipboard *clipboard, user_handle_t win )
 {
-    if (clipboard->open_thread && clipboard->open_thread->process != current->process)
+    if ((clipboard->open_thread && clipboard->open_thread->process != current->process) ||
+        (win && clipboard->owner_win != get_user_full_handle( win )))
     {
-        set_error(STATUS_WAS_LOCKED);
+        set_win32_error( ERROR_CLIPBOARD_NOT_OPEN );
         return 0;
     }
     clipboard->owner_win = 0;
@@ -221,7 +222,7 @@ DECL_HANDLER(set_clipboard_info)
     }
     else if (req->flags & SET_CB_RELOWNER)
     {
-        if (!release_clipboard_owner( clipboard )) return;
+        if (!release_clipboard_owner( clipboard, req->owner )) return;
     }
 
     if (req->flags & SET_CB_VIEWER) clipboard->viewer = get_user_full_handle( req->viewer );