diff --git a/src/core.js b/src/core.js
index 99521d91c..f701a20c1 100644
--- a/src/core.js
+++ b/src/core.js
@@ -373,9 +373,9 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
 	noConflict: function( deep ) {
-		window.$ = _$;
+		if ( window.$ === jQuery ) window.$ = _$;
 
-		if ( deep ) {
+		if ( deep && window.jQuery === jQuery ) {
 			window.jQuery = _jQuery;
 		}