diff --git a/powerline/bindings/ipython/since_5.py b/powerline/bindings/ipython/since_5.py
index ab92d6d6..5a899ae8 100644
--- a/powerline/bindings/ipython/since_5.py
+++ b/powerline/bindings/ipython/since_5.py
@@ -23,7 +23,8 @@ class ConfigurableIPythonPowerline(IPythonPowerline):
 	def do_setup(self, ip, prompts, shutdown_hook):
 		prompts.powerline = self
 
-		saved_msfn = ip._make_style_from_name
+		msfn_missing = ()
+		saved_msfn = getattr(ip, '_make_style_from_name', msfn_missing)
 
 		if hasattr(saved_msfn, 'powerline_original'):
 			saved_msfn = saved_msfn.powerline_original
@@ -43,7 +44,8 @@ class ConfigurableIPythonPowerline(IPythonPowerline):
 			_saved_msfn = saved_msfn
 			saved_msfn = lambda: _saved_msfn(ip)
 
-		ip._make_style_from_name = _make_style_from_name
+		if saved_msfn is not msfn_missing:
+			ip._make_style_from_name = _make_style_from_name
 
 		magics = PowerlineMagics(ip, self)
 		ip.register_magics(magics)
diff --git a/setup.py b/setup.py
index 9464ed58..f06b6bc0 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ else:
 
 
 def get_version():
-	base_version = '2.5.1'
+	base_version = '2.5.2'
 	base_version += '.dev9999'
 	try:
 		return base_version + '+git.' + str(subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip())
@@ -70,7 +70,7 @@ def get_version():
 
 setup(
 	name='powerline-status',
-	version='2.5.1',
+	version='2.5.2',
 	description='The ultimate statusline/prompt utility.',
 	long_description=README,
 	classifiers=[